Changeset 30516

Timestamp:

2016-05-09T16:11:32+12:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Moved to incremental rebuild in webeditor

Location:

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

Files:

• build/GS2PerlConstructor.java (modified) (3 diffs)
• service/DocumentMaker.java (modified) (4 diffs)
• service/GS2Construct.java (modified) (4 diffs)
• util/GSFile.java (modified) (1 diff)
• util/JDBMWrapper.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -203 +203 @@
         command.add(perlPath + "perl");
         command.add("-S");
-        command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "buildcol.pl");
+        command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "incremental-buildcol.pl");
+        command.add("-incremental");
+        command.add("-builddir");
+        command.add(GSFile.collectDir(this.site_home) + File.separator + this.collection_name + File.separator +"index");
         command.add("-site");
         command.add(this.site_name);
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
-        command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
+//      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
         command.addAll(extractParameters(this.process_params));
         command.add(this.collection_name);
@@ -228 +231 @@
         // first check that we have a building directory
         // (don't want to bother running activate.pl otherwise)
-        File build_dir = new File(GSFile.collectionBuildDir(this.site_home, this.collection_name));
+        File build_dir = new File(GSFile.collectionIndexDir(this.site_home, this.collection_name));
         if (!build_dir.exists())
         {
@@ -275 +278 @@
         command.add("-S");
         command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "activate.pl");
+        command.add("-incremental");
+        command.add("-builddir");
+        command.add(GSFile.collectDir(this.site_home) + File.separator + this.collection_name + File.separator +"index");
         command.add("-site");
         command.add(this.site_name);
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
-        command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
+//      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
         command.add("-skipactivation"); // gsdl3/util/GS2Construct does the activation and reactivation
         command.addAll(extractParameters(this.process_params));

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

@@ -36 +36 @@
 import org.apache.log4j.*;
 
+import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
+
+
 import org.greenstone.gsdl3.util.GSDocumentModel;
+import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
@@ -91 +96 @@
             this.short_service_info.appendChild(service);
         }
-
+        
         _GSDM = new GSDocumentModel(this.site_home, this.router);
 
@@ -445 +450 @@
 
                     _GSDM.documentXMLSetText(oid, collection, newContent, userContext);
+                    
+                    markDocumentInFlatDatabase("R", collection, oid);
+
                 }
 
@@ -454 +462 @@
         }
         return result;
+        
+    }
+    protected void markDocumentInFlatDatabase(String mark, String collection, String oid) {
+    
+        Document msg_doc = XMLConverter.newDOM();
+        Element message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        UserContext userContext = new UserContext();
+        Element query_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE , collection, userContext);       
+        message.appendChild(query_request);
+        Element result = (Element) this.router.process(message);
+        Element resp_elem = (Element) GSXML.getChildByTagName(result, GSXML.RESPONSE_ELEM);
+        Element coll_elem = (Element) GSXML.getChildByTagName(resp_elem, GSXML.COLLECTION_ELEM);
+        String dbtype = coll_elem.getAttribute(GSXML.DB_TYPE_ATT);
+        
+        SimpleCollectionDatabase coll_db = new SimpleCollectionDatabase(dbtype);
+        if (!coll_db.databaseOK())
+        {
+            logger.error("Couldn't create the collection database of type " + dbtype);
+            return;
+        }
+        
+        // Open database for reading
+        String coll_db_file = GSFile.archivesDatabaseFile(this.site_home, collection, dbtype);
+        if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ))
+        {
+            logger.error("Could not open collection archives database. Somebody already using this database!");
+        }
+        String old_value = coll_db.getValue(oid);
+        String new_value = old_value.replace("<index-status>B", "<index-status>" + mark);
+        // Close database for reading
+        coll_db.closeDatabase();
+        if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.WRITE))
+        {
+            logger.error("Could not open collection archives database. Somebody already using this database!");
+        }
+        coll_db.setValue(oid, new_value);
+        coll_db.closeDatabase();
+        
     }
 }

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

@@ -38 +38 @@
 import org.greenstone.gsdl3.util.GSStatus;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
@@ -79 +80 @@
     private static final String BUILDTYPE_MGPP = "mgpp";
 
+    protected static String DATABASE_TYPE = null;
+    protected SimpleCollectionDatabase coll_db = null;
+    
     // the list of the collections - store between some method calls
     private String[] collection_list = null;
@@ -710 +714 @@
             Set<Map.Entry<String, Serializable>> entries = params.entrySet();
             Iterator<Map.Entry<String, Serializable>> i = entries.iterator();
-            while(i.hasNext()) {
             
-            Map.Entry<String, Serializable> entry = i.next();
-            String paramname = entry.getKey();
-            paramname = paramname.replace("s1.", ""); // replaces all occurrences
-            if(paramname.equals("collection")) {
-                paramname = "c";
-            }
-            String paramvalue = (String)entry.getValue();
-
-            querystring.append(paramname + "=" + paramvalue);
-            if(i.hasNext()) {
-                querystring.append("&");
-            }
+            String oid = null;
+            
+            while (i.hasNext()) {
+
+                Map.Entry<String, Serializable> entry = i.next();
+                String paramname = entry.getKey();
+                paramname = paramname.replace("s1.", ""); // replaces all
+                                                            // occurrences
+                if (paramname.equals("collection")) {
+                    paramname = "c";
+                }
+                if (paramname.equals("d")){
+                    oid = (String) entry.getValue();
+                }
+                String paramvalue = (String) entry.getValue();
+
+                querystring.append(paramname + "=" + paramvalue);
+                if (i.hasNext()) {
+                    querystring.append("&");
+                }
             }
+            
+            markDocumentInFlatDatabase("R", coll_name, oid);
+            
             constructor.setQueryString(querystring.toString());
         }
@@ -940 +954 @@
     
   }
+    protected void markDocumentInFlatDatabase(String mark, String collection, String oid) {
+        
+        Document msg_doc = XMLConverter.newDOM();
+        Element message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        UserContext userContext = new UserContext();
+        Element query_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE , collection, userContext);       
+        message.appendChild(query_request);
+        Element result = (Element) this.router.process(message);
+        Element resp_elem = (Element) GSXML.getChildByTagName(result, GSXML.RESPONSE_ELEM);
+        Element coll_elem = (Element) GSXML.getChildByTagName(resp_elem, GSXML.COLLECTION_ELEM);
+        String dbtype = coll_elem.getAttribute(GSXML.DB_TYPE_ATT);
+        
+        SimpleCollectionDatabase coll_db = new SimpleCollectionDatabase(dbtype);
+        if (!coll_db.databaseOK())
+        {
+            logger.error("Couldn't create the collection database of type " + dbtype);
+            return;
+        }
+        
+        // Open database for reading
+        String coll_db_file = GSFile.archivesDatabaseFile(this.site_home, collection, dbtype);
+        if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ))
+        {
+            logger.error("Could not open collection archives database. Somebody already using this database!");
+        }
+        String old_value = coll_db.getValue(oid);
+        String new_value = old_value.replace("<index-status>B", "<index-status>" + mark);
+        // Close database for reading
+        coll_db.closeDatabase();
+        if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.WRITE))
+        {
+            logger.error("Could not open collection archives database. Somebody already using this database!");
+        }
+        coll_db.setValue(oid, new_value);
+        coll_db.closeDatabase();
+        
+    }
 }

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

@@ -356 +356 @@
     }
 
+    /** the archives database file - */
+    static public String archivesDatabaseFile(String site_home, String collection_name, String database_type)
+    {
+    String db_ext = DBHelper.getDBExtFromDBType(database_type);
+    if (null == db_ext || db_ext.equals("")) {
+        logger.warn("Could not recognise database type \"" + database_type + "\", defaulting to GDBM and extension \".gdb\"");
+        // assume gdbm
+        db_ext = ".gdb";
+    }
+    return site_home + File.separatorChar + "collect" + File.separatorChar + collection_name + File.separatorChar + "archives" + File.separatorChar + "archiveinf-doc" + db_ext;
+    }
     // some file utility methods
 

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

@@ -44 +44 @@
 
     RecordManager recman_ = null;
-    HTree hashtable_;
+    HTree hashtable_ = null;
 
     String db_filename_;
@@ -159 +159 @@
     public String getValue(String key)
     {
-
+        if (hashtable_ == null) {
+            logger.error("Database was not opened or not exist!");
+            return null;
+        }
+        
         String val;