Changeset 27135 for main/trunk/greenstone3/src/java/org/greenstone

Timestamp:

2013-03-27T17:03:26+13:00 (11 years ago)

Author:

ak19

Message:

Shifting instructions for svn updating gs2build/common-src/cgi-bin scripts for moving into gs3/web/WEB-INF/cgi to its own target and making sure it gets called at the same time as it did before (previously in prepare-gli and svnupdate-gli targets, now called alongside those targets). Now metadata-server.pl in cgi-bin is also svn-updated.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• service/GS2Construct.java (modified) (1 diff)
• util/GSFile.java (modified) (1 diff)
• util/usersDB2txt.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -166 +166 @@
     protected Element processBuildAndActivateCollection(Element request)
     {
+
+        logger.error("**** GS2Construct Build and Activate: " + GSXML.elementToString(request, true));
+
         waitUntilReady(request);
         Element buildResponse = processBuildCollection(request);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -436 +436 @@
         }
         // delete the file or directory
-        return f.delete();
+        boolean success = f.delete();
+        if(!success) {
+            logger.error("***** Could not delete file: " + f);
+        }
+        return success;
+        //return f.delete();
+
     }
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/usersDB2txt.java

@@ -29 +29 @@
 import java.util.Properties;
 
+// Run as java org.greenstone.gsdl3.util.usersDB2txt <usersDB file>
 public class usersDB2txt
 {