Changeset 37217

Timestamp:

2023-01-30T14:39:57+13:00 (15 months ago)

Author:

davidb

Message:

Better error checking/info on what to do

File:

• gs3-installations/test-suite/trunk/sites/test-suite/collect/filelevel-docver--paged-image/_TEST-STEP02--GET-AND-SET-ASSOCFILES.sh (modified) (2 diffs)

gs3-installations/test-suite/trunk/sites/test-suite/collect/filelevel-docver--paged-image/_TEST-STEP02--GET-AND-SET-ASSOCFILES.sh

@@ -26 +26 @@
 
 
-# The following posts to Greenstone3 using CURL, however GS3 action requires user authentication to run
-# As written the following when fail, due to it no supplying user-authentication details
-# A HACK to do here is edit:
-#   gs2build/perllib/cgiactions/metadataaction.pm
-# and comment out the GS3_AUTHENTICATED test, changing the Perl code so it always
-# loads in modmetadataaction.pm (the module that has all the set-.* actions)
-
 
 cd "$store_cwd"
-export GS3_AUTHENTICATED=true
 
 echo "========"
@@ -50 +42 @@
      -F "assocname=09_1_1_1.gif" \
      -F "fileupload=@testing-files/10_1_1_1_CHANGED.gif" \
-     $gs_context_url/cgi-bin/metadata-server.pl 
+     $gs_context_url/cgi-bin/metadata-server.pl > curl-output.txt
+
+fgrep ERROR curl-output.txt >/dev/null 2>&1
+curl_fgrep_error=$?
+
+cat curl-output.txt
+/bin/rm curl-output.txt
+
 echo ""
 echo "--------"
 echo ""
 
+if [ $curl_fgrep_error = 0 ] ; then
 
-echo "+ Checking the following files are different:"
-echo "+   import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif"
-
-ls -li import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif
-
-diff import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif
-
-diff_status=$?
-
-if [ $diff_status != 0 ] ; then
-    echo "+"
-    echo "+  Diff-test Successful!"
-    echo "+"
+    echo "" >&2
+    echo "Error: failed to run 'curl' command" >&2
+    
+    echo ""
+    echo "The above 'curl' command posts a form to 'metadata-server.pl' as a URL, "
+    echo "rather than setting QUERY_STRING and faking a run at the commandline."
+    echo "This means it the Tomcat server operated version of metadta-server.pl that"
+    echo "runs, and so the usual trick of setting GS3_AUTHENTICATED inside this script"
+    echo "doesn't work, and the curl command will fail saying there is no action"
+    echo "called 'set-archives-assocfile'"
+    echo ""
+    echo "A workaround is possible, by adjusting how tomcat is being run:"
+    echo "    ant stop"
+    echo "    export GS3_AUTHENTICATED=true"
+    echo "    ant reset-logs"
+    echo "    ant start"
+    echo ""
+    echo "This effectively pulls off the same within-script trick, only getting"
+    echo "it into the environment so Tomcat sees it, and passess it on when it"
+    echo "runs metadata-server.pl"
+else
+   
+    echo "+ Checking the following files are different:"
+    echo "+   import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif"
+    
+    ls -li import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif
+    
+    diff import/09/images/09_1_1_1.gif archives/HASH01b0.dir/09_1_1_1.gif
+    
+    diff_status=$?
+    
+    if [ $diff_status != 0 ] ; then
+    echo "+"
+    echo "+  Diff-test Successful!"
+    echo "+"
+    fi
 fi
-
 
 echo ""