Changeset 9213 for trunk/ippdb/src/ippdb.c
- Timestamp:
- Oct 4, 2006, 11:22:25 AM (20 years ago)
- File:
-
- 1 edited
-
trunk/ippdb/src/ippdb.c (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippdb/src/ippdb.c
r9187 r9213 11815 11815 return false; 11816 11816 } 11817 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {11817 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 11818 11818 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 11819 11819 psFree(md); 11820 11820 return false; 11821 11821 } 11822 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {11822 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 11823 11823 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 11824 11824 psFree(md); … … 13858 13858 return false; 13859 13859 } 13860 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {13860 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 13861 13861 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 13862 13862 psFree(md); 13863 13863 return false; 13864 13864 } 13865 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {13865 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 13866 13866 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 13867 13867 psFree(md); … … 14495 14495 return false; 14496 14496 } 14497 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {14497 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 14498 14498 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 14499 14499 psFree(md); 14500 14500 return false; 14501 14501 } 14502 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {14502 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 14503 14503 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 14504 14504 psFree(md); … … 16080 16080 static void detNormalizedImfileRowFree(detNormalizedImfileRow *object); 16081 16081 16082 detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri )16082 detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) 16083 16083 { 16084 16084 detNormalizedImfileRow *object; … … 16091 16091 object->class_id = psStringCopy(class_id); 16092 16092 object->uri = psStringCopy(uri); 16093 object->b1_uri = psStringCopy(b1_uri); 16094 object->b2_uri = psStringCopy(b2_uri); 16093 16095 16094 16096 return object; … … 16099 16101 psFree(object->class_id); 16100 16102 psFree(object->uri); 16103 psFree(object->b1_uri); 16104 psFree(object->b2_uri); 16101 16105 } 16102 16106 … … 16132 16136 return false; 16133 16137 } 16138 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 16139 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 16140 psFree(md); 16141 return false; 16142 } 16143 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 16144 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 16145 psFree(md); 16146 return false; 16147 } 16134 16148 16135 16149 status = psDBCreateTable(dbh, DETNORMALIZEDIMFILE_TABLE_NAME, md); … … 16145 16159 } 16146 16160 16147 bool detNormalizedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri )16161 bool detNormalizedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) 16148 16162 { 16149 16163 psMetadata *md; … … 16168 16182 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) { 16169 16183 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 16184 psFree(md); 16185 return false; 16186 } 16187 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, b1_uri)) { 16188 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 16189 psFree(md); 16190 return false; 16191 } 16192 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, b2_uri)) { 16193 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 16170 16194 psFree(md); 16171 16195 return false; … … 16192 16216 return deleted; 16193 16217 } 16194 bool detNormalizedImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **class_id, char **uri )16218 bool detNormalizedImfilePop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **class_id, char **uri, char **b1_uri, char **b2_uri) 16195 16219 { 16196 16220 psArray *rowSet; … … 16260 16284 return false; 16261 16285 } 16286 *b1_uri = psMetadataLookupPtr(&status, row, "b1_uri"); 16287 if (!status) { 16288 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); 16289 psFree(row); 16290 return false; 16291 } 16292 *b2_uri = psMetadataLookupPtr(&status, row, "b2_uri"); 16293 if (!status) { 16294 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); 16295 psFree(row); 16296 return false; 16297 } 16262 16298 16263 16299 psFree(row); … … 16268 16304 bool detNormalizedImfileInsertObject(psDB *dbh, detNormalizedImfileRow *object) 16269 16305 { 16270 return detNormalizedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri );16306 return detNormalizedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->b1_uri, object->b2_uri); 16271 16307 } 16272 16308 … … 16288 16324 char class_id[256]; 16289 16325 char uri[256]; 16290 16291 if (!detNormalizedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri)) { 16326 char b1_uri[256]; 16327 char b2_uri[256]; 16328 16329 if (!detNormalizedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { 16292 16330 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 16293 16331 return NULL; 16294 16332 } 16295 16333 16296 return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri );16334 return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, b1_uri, b2_uri); 16297 16335 } 16298 16336 … … 16413 16451 return NULL; 16414 16452 } 16453 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, object->b1_uri)) { 16454 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 16455 psFree(md); 16456 return NULL; 16457 } 16458 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, object->b2_uri)) { 16459 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 16460 psFree(md); 16461 return NULL; 16462 } 16415 16463 16416 16464 return md; … … 16424 16472 char *class_id; 16425 16473 char *uri; 16474 char *b1_uri; 16475 char *b2_uri; 16426 16476 16427 16477 det_id = psMetadataLookupS32(&status, md, "det_id"); … … 16445 16495 return false; 16446 16496 } 16447 16448 return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri); 16497 b1_uri = psMetadataLookupPtr(&status, md, "b1_uri"); 16498 if (!status) { 16499 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri"); 16500 return false; 16501 } 16502 b2_uri = psMetadataLookupPtr(&status, md, "b2_uri"); 16503 if (!status) { 16504 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri"); 16505 return false; 16506 } 16507 16508 return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, b1_uri, b2_uri); 16449 16509 } 16450 16510 psArray *detNormalizedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 16620 16680 return false; 16621 16681 } 16622 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {16682 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 16623 16683 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 16624 16684 psFree(md); 16625 16685 return false; 16626 16686 } 16627 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {16687 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 16628 16688 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 16629 16689 psFree(md); … … 18123 18183 return false; 18124 18184 } 18125 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, " 64")) {18185 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "255")) { 18126 18186 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 18127 18187 psFree(md); … … 18148 18208 return false; 18149 18209 } 18150 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {18210 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 18151 18211 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 18152 18212 psFree(md); 18153 18213 return false; 18154 18214 } 18155 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {18215 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 18156 18216 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 18157 18217 psFree(md); … … 18815 18875 return false; 18816 18876 } 18817 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, " 64")) {18877 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b1_uri", 0, NULL, "255")) { 18818 18878 psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri"); 18819 18879 psFree(md); 18820 18880 return false; 18821 18881 } 18822 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, " 64")) {18882 if (!psMetadataAddStr(md, PS_LIST_TAIL, "b2_uri", 0, NULL, "255")) { 18823 18883 psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri"); 18824 18884 psFree(md);
Note:
See TracChangeset
for help on using the changeset viewer.
