Changeset 24565

Timestamp:

Jun 25, 2009, 3:08:22 PM (17 years ago)

Author:

eugene

Message:

importing changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (2 diffs)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• Nebulous-Server/t/13_server_find_objects.t (modified) (6 diffs)
• Nebulous/bin (modified) (1 prop)
• Nebulous/t/70_neb-ls.t (modified) (5 diffs)
• ippTools/share/chiptool_export_imfile.sql (modified) (1 prop)
• ippTools/share/chiptool_export_processed_imfile.sql (modified) (1 prop)
• ippTools/share/warptool_revertoverlap.sql (modified) (1 prop)
• ippTools/src/camtool.c (modified) (1 diff)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippTools/src/chiptool.c (modified) (1 diff)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippTools/src/faketool.c (modified) (1 diff)
• ippTools/src/faketoolConfig.c (modified) (1 diff)
• ippTools/src/warptool.c (modified) (2 diffs)
• ippTools/src/warptoolConfig.c (modified) (2 diffs)
• ppImage/src/ppImageReplaceBackground.c (modified) (1 diff)
• psLib/src/mathtypes/psVector.c (modified) (3 diffs)

branches/eam_branches/20090522/Nebulous-Server/Changes

@@ -29 +29 @@
     - infinitely try to get a db handle if the connection fails
     - add --mountpoint param to neb-voladd
+    - change Nebulous::Server->find_objects() to return dirs and to sort it's
+      output 
       
 0.16

branches/eam_branches/20090522/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1449 +1449 @@
     }
 
-    eval {
-        $log->debug("trying for a directory match under dir: $dir_id");
+    # find dirs under dir
+    my @dir_keys;
+    eval {
+        $log->debug("looking for directories under dir: $dir_id");
+        my $query = $db->prepare_cached( $sql->find_dir_by_parent_id);
+        $query->execute( $dir_id );
+
+        while ( my $row = $query->fetchrow_hashref ) {
+            next if $row->{'dir_id'} == 1;
+            my $dir = $row->{'dirname'};
+            if ($dir_id == 1) {
+                push @dir_keys, $dir . '/' if $dir;
+            } else {
+                push @dir_keys, $key->path . '/' . $dir . '/' if $dir;
+            }
+            $log->debug( "matched $dir" ) if $dir;
+        }
+    };
+    $log->logdie("database error: $@") if $@;
+
+    # find files under dir
+    eval {
+        $log->debug("looking for objects under dir: $dir_id");
         my $query = $db->prepare_cached( $sql->find_object_by_dir_id );
         $query->execute( $dir_id );
@@ -1463 +1484 @@
 
     $log->debug( "leaving" );
-
-    return \@keys;
+    
+    return [sort(@dir_keys), sort(@keys)];
 }
 

branches/eam_branches/20090522/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -317 +317 @@
         FROM storage_object
         WHERE dir_id = ?
+    },
+    find_dir_by_parent_id => qq{
+        SELECT dir_id, dirname
+        FROM directory
+        WHERE parent_id = ?
     },
     rename_object => qq{

branches/eam_branches/20090522/Nebulous-Server/t/13_server_find_objects.t

@@ -8 +8 @@
 use warnings FATAL => qw( all );
 
-use Test::More tests => 28;
+use Test::More tests => 36;
 
 use lib qw( ./t ./lib );
@@ -100 +100 @@
     my $keys = $neb->find_objects("a");
 
-    is(scalar @$keys, 1, 'number of keys found');
-    is($keys->[0], "a/foo", "key name");
+    is(scalar @$keys, 2, 'number of keys found');
+    is($keys->[0], "a/b/", "key name");
+    is($keys->[1], "a/foo", "key name");
 }
 
@@ -113 +114 @@
 
     is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "a/foo", "key name");
-    is($keys->[1], "a/bar", "key name");
+    is($keys->[0], "a/bar", "key name");
+    is($keys->[1], "a/foo", "key name");
 }
 
@@ -138 +139 @@
     my $keys = $neb->find_objects("/");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
 }
 
@@ -152 +154 @@
     my $keys = $neb->find_objects(".");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
 }
 
@@ -166 +169 @@
     my $keys = $neb->find_objects("..");
 
-    is(scalar @$keys, 2, 'number of keys found');
-    is($keys->[0], "foo", "key name");
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
     is($keys->[1], "bar", "key name");
+    is($keys->[2], "foo", "key name");
+}
+
+Test::Nebulous->setup;
+
+{
+    $neb->create_object("a/bar");
+    $neb->create_object("b/foo");
+    $neb->create_object("foo");
+
+    my $keys = $neb->find_objects("/");
+
+    is(scalar @$keys, 3, 'number of keys found');
+    is($keys->[0], "a/", "key name");
+    is($keys->[1], "b/", "key name");
+    is($keys->[2], "foo", "key name");
 }
 

branches/eam_branches/20090522/Nebulous/t/70_neb-ls.t

@@ -83 +83 @@
 
     is($? >> 8, 0, "exit code");
-    like($test->stdout, qr/^foo\nbar$/,  "stdout");
+    like($test->stdout, qr/^bar\nfoo$/,  "stdout");
     like($test->stderr, qr/^$/,         "stderr");
 }
@@ -99 +99 @@
 
     is($? >> 8, 0, "exit code");
-    like($test->stdout, qr/^foo\nbar\n$/,   "stdout");
+    like($test->stdout, qr/^bar\nfoo\n$/,   "stdout");
     like($test->stderr, qr/^$/,             "stderr");
 }
@@ -115 +115 @@
 
     is($? >> 8, 0, "exit code");
-    like($test->stdout, qr/^foo\nbar\n$/,   "stdout");
+    like($test->stdout, qr/^bar\nfoo\n$/,   "stdout");
     like($test->stderr, qr/^$/,             "stderr");
 }
@@ -161 +161 @@
 
     is($? >> 8, 0, "exit code");
-    like($test->stdout, qr|^a/foo\na/bar$|,  "stdout");
+    like($test->stdout, qr|^a/bar\na/foo$|,  "stdout");
     like($test->stderr, qr/^$/,             "stderr");
 }
@@ -193 +193 @@
 
     is($? >> 8, 0, "exit code");
-    like($test->stdout, qr|^a/foo$|,        "stdout");
+    like($test->stdout, qr|^a/b/\na/foo$|,        "stdout");
     like($test->stderr, qr/^$/,             "stderr");
 }

branches/eam_branches/20090522/ippTools/src/camtool.c

@@ -766 +766 @@
     pxcamGetSearchArgs (config, where);
     PXOPT_COPY_S64(config->args, where, "-cam_id",    "camRun.cam_id",         "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "camRun.label",          "==");
+    pxAddLabelSearchArgs (config, where, "-label",    "camRun.label",     "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction",      "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "camProcessedExp.fault", "==");

branches/eam_branches/20090522/ippTools/src/camtoolConfig.c

@@ -187 +187 @@
     pxcamSetSearchArgs(revertprocessedexpArgs);
     psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-cam_id",   0,            "search by cam_id", 0);
-    psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-label",    0,            "search by camRun label", NULL);
+    psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-label",    PS_META_DUPLICATE_OK, "search by camRun label", NULL);
     psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-reduction",0,            "search by camRun reduction class", NULL);
     psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code",     0,            "search by fault code", 0);

branches/eam_branches/20090522/ippTools/src/chiptool.c

@@ -676 +676 @@
     PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
-    // require a single label 
-    PXOPT_COPY_STR(config->args, where, "-label", "chipRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "chipProcessedImfile.fault", "==");

branches/eam_branches/20090522/ippTools/src/chiptoolConfig.c

@@ -169 +169 @@
     psMetadataAddStr(revertprocessedimfileArgs,  PS_LIST_TAIL, "-class_id",           0, "search by class ID", NULL);
     psMetadataAddStr(revertprocessedimfileArgs,  PS_LIST_TAIL, "-reduction",          0, "search by reduction class", NULL);
-    psMetadataAddStr(revertprocessedimfileArgs,  PS_LIST_TAIL, "-label",              0, "search by chipRun label (LIKE comparison)", NULL);
+    psMetadataAddStr(revertprocessedimfileArgs,  PS_LIST_TAIL, "-label",              PS_META_DUPLICATE_OK, "search by chipRun label (LIKE comparison)", NULL);
     pxchipSetSearchArgs(revertprocessedimfileArgs);
     psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);

branches/eam_branches/20090522/ippTools/src/faketool.c

@@ -632 +632 @@
 
     psMetadata *where = psMetadataAlloc();
+    pxAddLabelSearchArgs (config, where, "-label", "fakeRun.label", "==");
     PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "fakeRun.label", "==");
     PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "==");

branches/eam_branches/20090522/ippTools/src/faketoolConfig.c

@@ -198 +198 @@
     psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by fake ID", 0);
-    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
+    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);

branches/eam_branches/20090522/ippTools/src/warptool.c

@@ -680 +680 @@
     PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyCellMap.skycell_id", "==");
     PXOPT_COPY_STR(config->args, where, "-tess_id",    "warpSkyCellMap.tess_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",      "warpRun.label", "==");
+    // PXOPT_COPY_STR(config->args, where, "-label",      "warpRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "==");
     PXOPT_COPY_S16(config->args, where, "-fault",      "warpSkyCellMap.fault", "==");
 
@@ -1269 +1270 @@
     PXOPT_COPY_STR(config->args, where, "-tess_id",    "warpSkyfile.tess_id", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction",  "rawExp.reduction", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",      "warpRun.label", "==");
+    // PXOPT_COPY_STR(config->args, where, "-label",      "warpRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "==");
     PXOPT_COPY_S16(config->args, where, "-fault",       "warpSkyfile.fault", "==");
 

branches/eam_branches/20090522/ippTools/src/warptoolConfig.c

@@ -164 +164 @@
     psMetadataAddStr(revertoverlapArgs, PS_LIST_TAIL, "-skycell_id",  0,            "search by skycell ID", NULL);
     psMetadataAddStr(revertoverlapArgs, PS_LIST_TAIL, "-tess_id",  0,            "search by tessellation ID", NULL);
-    psMetadataAddStr(revertoverlapArgs, PS_LIST_TAIL, "-label",  0,            "search by warpRun label", NULL);
+    psMetadataAddStr(revertoverlapArgs, PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
     psMetadataAddS16(revertoverlapArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     psMetadataAddBool(revertoverlapArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
@@ -227 +227 @@
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id",  0,            "search by tessellation ID", NULL);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction",  0,            "search by warpRun reduction class", NULL);
-    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-label",  0,            "search by warpRun label", NULL);
+    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-label",  PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
     psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);

branches/eam_branches/20090522/ppImage/src/ppImageReplaceBackground.c

@@ -144 +144 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            float value = backData[y][x];
-            if (!isfinite(value)) {
-                image->data.F32[y][x] = NAN;
-                mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->lowMask;
+            if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) {
+                image->data.F32[y][x] = 0.0;
             } else {
-                image->data.F32[y][x] -= value;
-            }
+                float value = backData[y][x];
+                if (!isfinite(value)) {
+                    image->data.F32[y][x] = NAN;
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->lowMask;
+                } else {
+                    image->data.F32[y][x] -= value;
+                }
+            }
         }
     }

branches/eam_branches/20090522/psLib/src/mathtypes/psVector.c

@@ -77 +77 @@
     // Create vector data array
     vector->data.U8 = psAlloc(nalloc * elementSize);
+    memset (vector->data.U8, 0, nalloc * elementSize);
 
     return vector;
@@ -119 +120 @@
                 _("psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown."));
         return NULL;
-    } else if (vector->nalloc != nalloc) {     // No need to realloc to same size
-        elemType = vector->type.type;
-        elementSize = PSELEMTYPE_SIZEOF(elemType);
-        if (nalloc < vector->n) {
-            vector->n = nalloc;
-        }
-        // Realloc after decrementation to avoid accessing freed array elements
-        vector->data.U8 = psRealloc(vector->data.U8, nalloc * elementSize);
-        P_PSVECTOR_SET_NALLOC(vector,nalloc);
+    } 
+
+    
+    if (vector->nalloc == nalloc) {     
+        // No need to realloc to same size
+        return vector;
+    }
+     
+    elemType = vector->type.type;
+    elementSize = PSELEMTYPE_SIZEOF(elemType);
+
+    long nstart = vector->n;
+    if (nalloc < vector->n) {
+        vector->n = nalloc;
+    }
+    // Realloc after decrementation to avoid accessing freed array elements
+    vector->data.U8 = psRealloc(vector->data.U8, nalloc * elementSize);
+    P_PSVECTOR_SET_NALLOC(vector,nalloc);
+
+    // fill newly allocated range with zeros:
+    if (nstart < nalloc) {
+        long nNew = nalloc - nstart;
+        memset (&vector->data.U8[nstart*elementSize], 0, nNew*elementSize);
     }
 
@@ -165 +180 @@
     vector->type.type = type;
     vector->n = nalloc;
+
+    // zero the vector
+    memset (vector->data.U8, 0, byteSize);
+
     return vector;
 }