Changeset 27540 for other-projects

Timestamp:

2013-06-04T18:23:39+12:00 (11 years ago)

Author:

ak19

Message:

1. Reports better sent to the greenstone mail id 2. Need to import with OIDtype set to hashing on the full filename, to generate stable doc ids. This is how the model collections are generated, with which the locally built ones are to be compared. 3. Need to ensure the upload directory exists.

File:

• other-projects/nightly-tasks/diffcol/trunk/task (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task

@@ -7 +7 @@
 export DATA_DIR=$TASK_HOME/diffcol-data
 export UPLOAD_DIR=$TASK_HOME/diffcol-reports
-export MONITOR_EMAIL=anupama@waikato.ac.nz
+export MONITOR_EMAIL=greenstone_team@cs.waikato.ac.nz
 
 #check key environment vars are set
@@ -181 +181 @@
 
         #import
+        #Ensure the OIDtype for importing is hash_on_full_filename
+        # "to make document identifiers more stable across 
+        # upgrades of the software, although it means that 
+        # duplicate documents contained in the collection are no
+        # longer detected automatically."
         echo $collection' - Importing:'
         echo "<import>" >> $xmlout
-        import.pl $collection -removeold
+        import.pl -OIDtype hash_on_full_filename $collection -removeold
         echo "</import>" >> $xmlout 
         echo "done"
@@ -221 +226 @@
     fi
     echo "done"
-
 }
 
 function upload() {
-    scp $DATA_DIR/*.xml $DATA_DIR/*.html $UPLOAD_DIR
+    # ensure the upload directory exists 
+    # before trying to transfer the xml and html files across
+    if [ ! -d "$UPLOAD_DIR" ]; then
+    mkdir -p "$UPLOAD_DIR";
+    fi
+
+    scp $DATA_DIR/*.xml $DATA_DIR/*.html $UPLOAD_DIR
 }