Changeset 9214

Timestamp:

Oct 4, 2006, 11:42:12 AM (20 years ago)

Author:

jhoblitt

Message:

add detNormalizedImfile.b[12]_uri

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• scripts/dettest.sh (modified) (1 diff)
• src/dettool.c (modified) (3 diffs)
• src/dettoolConfig.c (modified) (1 diff)

trunk/ippTools/configure.ac

@@ -16 +16 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.43]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.44]) 
 
 AC_PROG_PERL_MODULES(

trunk/ippTools/scripts/dettest.sh

@@ -29 +29 @@
 dettool -tonormalize || exit 1
 for ID in `seq 0 3` ; do
-    dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID || exit 1
+    dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID -b1_uri banana1 -b2_uri banannnnnaaa2 || exit 1
 done;
 

trunk/ippTools/src/dettool.c

@@ -2913 +2913 @@
         return false;
     }
+    // optional
+    psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri");
+        return false;
+    }
+    psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri");
+        return false;
+    }
 
     return detNormalizedImfileRowAlloc(
@@ -2918 +2929 @@
         statImfile->iteration,
         statImfile->class_id,
-        uri
+        uri,
+        b1_uri,
+        b2_uri
     );
 }
@@ -3187 +3200 @@
         "SELECT * FROM"
         " (SELECT"
-        "   detNormalizedImfile.det_id,"
-        "   detNormalizedImfile.iteration,"
-        "   detNormalizedImfile.class_id,"
-        "   detNormalizedImfile.uri"
+        "   detNormalizedImfile.*"
         " FROM detNormalizedImfile"
         " JOIN detInputExp"

trunk/ippTools/src/dettoolConfig.c

@@ -276 +276 @@
     psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-uri",  0,
         "define URI (required)", NULL);
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b1_uri",  0,
+        "define banana 1", NULL);
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
+        "define banana 2", NULL);
 
     // -tonormalizedexp