Changeset 36998

Timestamp:

2022-12-09T00:11:00+13:00 (6 months ago)

Author:

davidb

Message:

Tweaks after testing

Location:

gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/prepare

Files:

• 01-ARCHIVE-TO-ITEM.sh (modified) (2 diffs)
• 02-COPY-TO-IMPORT.sh (modified) (2 diffs)

gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/prepare/01-ARCHIVE-TO-ITEM.sh

@@ -3 +3 @@
 # HMS_1/HMS_1.pdf
 
+if [ ! -d Items ] ; then
+    echo ""
+    echo "Creating directory: Items"
+    echo ""
+    mkdir Items
+fi
 
-for archive_dir in HMS_*[0-9] ; do
-    echo "Processing $archive_dir"
+for full_archive_dir in Archive/HMS_*[0-9] ; do
+    echo "Processing $full_archive_dir"
+    archive_dir=${full_archive_dir##*/}
     vol=${archive_dir#*_}
     
-    item_dir=${archive_dir}_item
+    full_item_dir=Items/${archive_dir}
+    item_dir=${archive_dir}
     
-    /bin/rm -rf $item_dir
-    mkdir $item_dir
-    #mkdir $item_dir/TIFFs
-    mkdir $item_dir/JPEGs
+    /bin/rm -rf $full_item_dir
+    mkdir $full_item_dir
+    #mkdir $full_item_dir/TIFFs
+    mkdir $full_item_dir/JPEGs
+
+    full_item_filename=$full_item_dir/$archive_dir.item
 
     echo ""
-    echo "Generating $item_filename"
+    echo "Generating $full_item_filename"
     echo ""
-
-    item_filename=$item_dir/$archive_dir.item
    
-    echo "<Volume>$vol" > $item_filename
-
+    echo "<Volume>$vol" > $full_item_filename
     
-    #images=$(cd $archive_dir/TIFFs && ls ${archive_dir}_[0-9][0-9][0-9][0-9].tif)
-    images=$(cd $archive_dir/JPEGs && ls ${archive_dir}_[0-9][0-9][0-9][0-9].jpg)
+    #images=$(cd $full_archive_dir/TIFFs && ls ${archive_dir}_[0-9][0-9][0-9][0-9].tif)
+    images=$(cd $full_archive_dir/JPEGs && ls ${archive_dir}_[0-9][0-9][0-9][0-9].jpg)
 
     echo "  Appending/Copying Images"
@@ -33 +40 @@
     page_num=${page_num_with_ext%.jpg}
     
-    #echo "    $archive_dir/TIFFs/$image -> $item_dir/TIFFs/$image"
-    #/bin/cp $archive_dir/TIFFs/$image $item_dir/TIFFs/$image
-    echo "    $archive_dir/JPEGs/$image -> $item_dir/JPEGs/$image"
-    /bin/cp $archive_dir/JPEGs/$image $item_dir/JPEGs/$image
+    #echo "    $full_archive_dir/TIFFs/$image -> $full_item_dir/TIFFs/$image"
+    #/bin/cp $full_archive_dir/TIFFs/$image $full_item_dir/TIFFs/$image
+    echo "    $full_archive_dir/JPEGs/$image -> $full_item_dir/JPEGs/$image"
+    /bin/cp $full_archive_dir/JPEGs/$image $full_item_dir/JPEGs/$image
 
     # Only image, no ocr'd txt file
-    #echo "$page_num:TIFFs/$image:" >> $item_filename
-    echo "$page_num:JPEGs/$image:" >> $item_filename
+    #echo "$page_num:TIFFs/$image:" >> $full_item_filename
+    echo "$page_num:JPEGs/$image:" >> $full_item_filename
     done
 

gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/prepare/02-COPY-TO-IMPORT.sh

@@ -1 +1 @@
 #!/bin/bash
 
-echo "Copying HMS_*_item directories to ../import"
+echo "Copying Items/HMS_* directories to ../import"
 
-for d in HMS_*_item ; do
+for full_d in Items/HMS_* ; do
+    d=${full_d##*/}
     if [ -d ../import/$d ] ; then
     echo "  Removing pre-existing ../import/$d"
@@ -10 +11 @@
 
     echo "  Copying $d"
-    /bin/cp -r $d ../import/.
+    /bin/cp -r $full_d ../import/.
 done