Changeset 15341

Timestamp:

Oct 19, 2007, 3:27:00 PM (19 years ago)

Author:

jhoblitt

Message:

implement -addmask

Location:

trunk/ippTools

Files:

• scripts/magictest.sh (modified) (1 diff)
• src/magictool.c (modified) (1 diff)

trunk/ippTools/scripts/magictest.sh

@@ -10 +10 @@
 magictool -addinputskyfile -magic_id 1 -diff_id 2 -node b || exit 1
 magictool -inputtree -magic_id 1 -dep_file magic_dep.md 
+magictool -updaterun -state run -magic_id 1 || exit 1
+
 magictool -addresult -magic_id 1 -node a -uri file:///foo/a
 magictool -addresult -magic_id 1 -node b -uri file:///foo/b
 magictool -addresult -magic_id 1 -node root -uri file:///foo/root
+magictool -tomask
+magictool -addmask -magic_id 1 -uri file:///foo/mask
 
-magictool -updaterun -state run -magic_id 1 || exit 1
 
 

trunk/ippTools/src/magictool.c

@@ -655 +655 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psString magic_id = psMetadataLookupStr(&status, config->args, "-magic_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -magic_id");
+        return false;
+    }
+    if (!magic_id) {
+        psError(PS_ERR_UNKNOWN, true, "-magic_id is required");
+        return false;
+    }
+
+    psString uri = psMetadataLookupStr(&status, config->args, "-uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
+        return false;
+    }
+    if (!uri) {
+        psError(PS_ERR_UNKNOWN, true, "-uri is required");
+        return false;
+    }
+
+    if (!magicMaskInsert(config->dbh,
+                (psS64)atoll(magic_id),
+                uri
+        )) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
     return true;
 }