Changeset 4304 for trunk/gli

Timestamp:

2003-05-23T16:14:15+12:00 (21 years ago)

Author:

jmt12

Message:

hardcoded understanding that dls=demo and doesn't mung format and classify statements

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -253 +253 @@
                           // If the source collection is one of the 'big five' then we know what the metadata set is.
                           String collection_name = col_con.getName();
-                          if(collection_name.equals(Utility.COLLECTION_DLS)) {
+                          // Demo collection - part of the DLS
+                          if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
+                                String demo_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DEMO_DIRECTORY)).getAbsolutePath();
+                                String dls_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DLS_DIRECTORY)).getAbsolutePath();
                                 // Add the dls.mds
                                 collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.DLS_MDS), false);
-                                // Add the mappings
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "AZList", "dls.AZList");
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "Keyword", "dls.Keyword");
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "Language", "dls.Language");
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "Organization", "dls.Organization");
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "Subject", "dls.Subject");
-                                collection.msm.profiler.addAction(base_collection_directory.getAbsolutePath(), "Title", "dls.Title");
+                                // Add the mappings for the dls (even if its not present).
+                                collection.msm.profiler.addAction(dls_directory, "AZList", "dls.AZList");
+                                collection.msm.profiler.addAction(dls_directory, "Keyword", "dls.Keyword");
+                                collection.msm.profiler.addAction(dls_directory, "Language", "dls.Language");
+                                collection.msm.profiler.addAction(dls_directory, "Organization", "dls.Organization");
+                                collection.msm.profiler.addAction(dls_directory, "Subject", "dls.Subject");
+                                collection.msm.profiler.addAction(dls_directory, "Title", "dls.Title");
+                                // Add the mappings for the demo dls (even if its not present).
+                                collection.msm.profiler.addAction(demo_directory, "AZList", "dls.AZList");
+                                collection.msm.profiler.addAction(demo_directory, "Keyword", "dls.Keyword");
+                                collection.msm.profiler.addAction(demo_directory, "Language", "dls.Language");
+                                collection.msm.profiler.addAction(demo_directory, "Organization", "dls.Organization");
+                                collection.msm.profiler.addAction(demo_directory, "Subject", "dls.Subject");
+                                collection.msm.profiler.addAction(demo_directory, "Title", "dls.Title");
                                 // Skip the import phase
                                 skip_import_phase = true;
@@ -1083 +1093 @@
                           }
                      }
+                     else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
+                          StringTokenizer tokenizer = new StringTokenizer(command);
+                          StringBuffer text = new StringBuffer(tokenizer.nextToken());
+                          // Read in the classifier command watching for hfile, metadata and sort arguments.
+                          String hfile = null;
+                          String metadata = null;
+                          while(tokenizer.hasMoreTokens()) {
+                                String token = tokenizer.nextToken();
+                                if(token.equals(Utility.CFG_CLASSIFY_HFILE)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          token = tokenizer.nextToken();
+                                          hfile = token;
+                                     }
+                                }
+                                else if(token.equals(Utility.CFG_CLASSIFY_METADATA)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          String temp_metadata = tokenizer.nextToken();
+                                          String replacement = (String) mappings.get(temp_metadata);
+                                          if(replacement != null) {
+                                                token = replacement;
+                                                metadata = replacement;
+                                          }
+                                          else {
+                                                token = temp_metadata;
+                                          }
+                                          temp_metadata = null;
+                                          replacement = null;
+                                     }
+                                }
+                                else if(token.equals(Utility.CFG_CLASSIFY_SORT)) {
+                                     if(tokenizer.hasMoreTokens()) {
+                                          text.append(" ");
+                                          text.append(token);
+                                          String temp_metadata = tokenizer.nextToken();
+                                          String replacement = (String) mappings.get(temp_metadata);
+                                          if(replacement != null) {
+                                                token = replacement;
+                                          }
+                                          else {
+                                                token = temp_metadata;
+                                          }
+                                          temp_metadata = null;
+                                          replacement = null;
+                                     }
+                                }
+                                text.append(' ');
+                                text.append(token);
+                                token = null;
+                          }
+                          tokenizer = null;
+                          command = text.toString();
+                          // Replace the hfile if we found it
+                          if(hfile != null && metadata != null) {
+                                command = command.replaceAll(hfile, metadata + ".txt");
+                          }
+                          hfile = null;
+                          metadata = null;
+                          write(out, command);
+                     }
                      else {
+                          // There is still one special case, that of the format command. In such a command we have to search for [<target>] to ensure we don't change parts of the format which have nothing to do with the metadata elements.
+                          boolean format_command = command_lc.startsWith(Utility.CFG_FORMAT);
                           // Replace mapping strings
                           if(mappings != null) {
@@ -1089 +1164 @@
                                      String target = (String) keys.next();
                                      String replacement = (String) mappings.get(target);
+                                     if(format_command) {
+                                          target = "\\[" + target + "\\]";
+                                          replacement = "[" + replacement + "]";
+                                     }
                                      command = command.replaceAll(target, replacement);
                                 }
-                                // See if the command line contains any of the things that need changing.
-                                String hfile = null;
-                                String metadata = null;
-                                CommandTokenizer tokenizer = new CommandTokenizer(command);
-                                while(tokenizer.hasMoreTokens()) {
-                                     String token = tokenizer.nextToken();
-                                     if(token.equals(Utility.CFG_CLASSIFY_HFILE)) {
-                                          hfile = tokenizer.nextToken();
-                                     }
-                                     else if(token.equals(Utility.CFG_CLASSIFY_METADATA)) {
-                                          metadata = tokenizer.nextToken();
-                                     }
-                                }
-                                tokenizer = null;
-                                // Replace the hfile if we found it
-                                if(hfile != null && metadata != null) {
-                                     String result = (String) mappings.get(metadata);
-                                     if(result == null) {
-                                          result = metadata;
-                                     }
-                                     command = command.replaceAll(hfile, result + ".txt");
-                                }
-                                hfile = null;
-                                metadata = null;
                           }
                           write(out, command);