Changeset 8411 for trunk/greenstone3-extensions

Timestamp:

2004-10-22T14:47:12+13:00 (20 years ago)

Author:

kjdon

Message:

removed some commented out code, added use views option

File:

• trunk/greenstone3-extensions/vishnu/src/vishnu/builder/IndexerGUI.java (modified) (6 diffs)

trunk/greenstone3-extensions/vishnu/src/vishnu/builder/IndexerGUI.java

@@ -16 +16 @@
     public static void addComponentsToPane(Container pane)
     {
-        //String[] labels = {"Top directory of Vishnu: ", "Name of Collection: ", "Directory of Collection: ", "Source directory: ", "Indexer (\"mg\" or \"luc\"): ", "Collection Description: "};
-    String [] labels = {"Collections directory: ", "Collection id (directory name): ", "Collection name: ","Collection description: ", "Indexer (\"mg\" or \"luc\"): "};
+    String [] labels = {"Collections directory: ", "Collection id (directory name): ", "Collection name: ","Collection description: ", "Indexer (\"mg\" or \"luc\"): ", "Use views (\"yes\" or \"no\"): "};
         int numPairs = labels.length;
         textFields = new JTextField[numPairs];
@@ -56 +55 @@
 
     butPan.add(new Box.Filler(minSize, prefSize, maxSize));
-
-//  button = new JButton(" Options ");
-//      button.setBorder(BorderFactory.createBevelBorder(0));
-//  butPan.add(button);
     
         butPan.add(new Box.Filler(minSize, prefSize, maxSize));
-
-//  button = new JButton(" Help ");
-//        button.setBorder(BorderFactory.createBevelBorder(0));
-//        butPan.add(button);
 
     pane.add(butPan);
@@ -80 +71 @@
     {
     // get data
-        //String source = textFields[3].getText();
-    //String dir = textFields[2].getText();
-    //String name = textFields[1].getText();
-    //String home = textFields[0].getText();
     String colls_home = textFields[0].getText();
     String coll_id = textFields[1].getText();
@@ -89 +76 @@
     String coll_desc = textFields[3].getText();
     String indexer = textFields[4].getText();
+    String use_views_str = textFields[5].getText();
     String coll_home = colls_home;
     if (!coll_home.endsWith(File.separator)) {
@@ -94 +82 @@
     }
     coll_home += coll_id + File.separator;
-    //String del = "";
-        //String description = textFields[5].getText();
-    //String output = "Launching Collection Builder with \n source = " + source + "\n dir = " + dir + "\n name = " + name + "\n home = " + home + "\n indexer = " + indexer + "\n description = " + description;
+
+    if (!indexer.equals("mg") || !indexer.equals("luc")) {
+        indexer = "mg";
+    }
+    boolean use_views = false;
+    if (use_views_str.equals("yes")) {
+        use_views = true;
+    }
     String output = "Launching Collection Builder with \n collections home = "+colls_home + "\n collection id = "+coll_name+"\n indexer = "+indexer;
+    if (use_views) {
+        output += "\n using views";
+    } else {
+        output += "\n not using views";
+    }
     ja.setText(output);
 
-    //CollectionBuilder builder = new CollectionBuilder(dir,name,home,indexer);
-    CollectionBuilder builder = new CollectionBuilder(coll_home, coll_id, coll_name, coll_desc, indexer, false); // no views for now - change this
+    CollectionBuilder builder = new CollectionBuilder(coll_home, coll_id, coll_name, coll_desc, indexer, use_views); 
     output += "\n Indexing Finished";
     ja.setText(output);
@@ -125 +122 @@
 
     public static void main(String[] args) {
-    //javax.swing.SwingUtilities.invokeLater(new Runnable() {
-          //  public void run() {
-                createAndShowGUI();
-          //  }
-        //});
+    createAndShowGUI();
     }
 }