Changeset 2131

Timestamp:

2001-03-08T02:10:35+13:00 (23 years ago)

Author:

say1

Message:

getior now works properly

File:

• trunk/java-client/org/nzdl/gsdl/SimpleClient.java (modified) (10 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleClient.java

@@ -27 +27 @@
 // java libraries we're using
 import java.io.BufferedReader;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -32 +33 @@
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -92 +94 @@
   /** The IOR that was specified on the commandline */
   String IORFromCommandLine = null;
+  /** The URL that was specified on the commandline */
+  String URLFromCommandLine = null;
   /** The collection to query */
   String collectionNameToQuery = "";
@@ -105 +109 @@
   int verbosity = 2;
 
+  String[] urlsCompiledIn = 
+  { 
+    "http://nikau.cs.waikato.ac.nz/~say1/gsdl/cgi-bin/getior", 
+    "http://www.nzdl.org/cgi-bin/getior"
+  };
+
   /** 
    * Basic no-args constructor. Not recommended for normal use, 
@@ -129 +139 @@
     // read our prevously seed IORs ...
     knownIORs = new Properties();
-    
-    File file = new File(propertiesFileName);
-    try {
-      if (file.exists()) {
-    knownIORs.load(new FileInputStream(file));
-      } 
-    } catch (IOException i) {
-      System.err.println("Error reading properties file:" + i);
-    }
-    
-    if (IORFromCommandLine != null)
-      attemptToInitialise(args, null, IORFromCommandLine);
-    
+    String IOR = null;
+    
+    // try a URL from the command line
+    if (URLFromCommandLine != null) {
+      IOR = getIORfromURL(URLFromCommandLine);
+      attemptToInitialise(args, null, IOR);
+    }
+    
+    // try an IOR from the command line
+    if (IORFromCommandLine != null && nzdl == null) {
+      IOR = IORFromCommandLine;
+      attemptToInitialise(args, null, IOR);
+    }
+
+    // try an IOR from a file (the filename may have been 
+    // given from teh commandline
     if (nzdl == null) {
-      String IOR = getIorKey(IORFileName);
-      System.err.println("ior = " + IOR);
-      System.err.println("after IOR");
+      IOR = getIorKey(IORFileName);
       attemptToInitialise(args, null, IOR);
     }
     
-    Enumeration e = knownIORs.keys();
-    while (e.hasMoreElements() && nzdl == null) {
-      String IOR = (String) e.nextElement();
-      attemptToInitialise(args, null, IOR);
-      
+    // try the compiled-in URLs
+    if (nzdl == null) {
+      for (int i=0;( i<urlsCompiledIn.length && nzdl == null );i++) {
+    IOR = getIORfromURL(urlsCompiledIn[i]);
+    attemptToInitialise(args, null,IOR);
+      }
+    }
+
+    // the knownIORs is the last resort
+    if (nzdl == null) {
+      File file = new File(propertiesFileName);
+      try {
+    if (file.exists()) {
+      knownIORs.load(new FileInputStream(file));
+    } 
+      } catch (IOException i) {
+    System.err.println("Error reading properties file:" + i);
+      }
+
+      Enumeration e = knownIORs.keys();
+      while (e.hasMoreElements() && nzdl == null) {
+    IOR = (String) e.nextElement();
+    attemptToInitialise(args, null, IOR);
+      }
     }
     
     knownIORs.put(IOR,"");
+  }
+  
+  public String getIORfromURL(String str)
+  {
+
+    String ior = null;
+    
+    try { 
+      System.err.println("Looking for a URL at:" + str);
+      URL url = new URL(str);
+      InputStream his = url.openStream();
+      DataInputStream dhis = new DataInputStream(his) ;
+      ior = dhis.readLine();
+      return ior;
+    } catch (Throwable throwable) {
+      System.err.println("NzdlHosts::getIOR() unable to construct or read URL \"" +
+             str + "\", \"" + ior + "\": " + throwable);
+      return "";
+    }
   }
 
@@ -357 +406 @@
     s += "Short form Long form                Explanation\n";
     s += "-h         --help                   Print this help text\n";
+    s += "-u <url>   --URL <url>              Use <url> to connect\n";
     s += "-I <IOR>   --IOR <IOR>              Use <IOR> to connect\n";
     s += "-f <file>  --file <IOR>             Look for an IOR if <file>\n";
@@ -377 +427 @@
     System.err.println("in parseArgs");
    
-    LongOpt[] longopts = new LongOpt[9];
+    LongOpt[] longopts = new LongOpt[10];
     int i = 0;
     StringBuffer sb = new StringBuffer();
@@ -383 +433 @@
     longopts[i++]  = new LongOpt("help",                  LongOpt.NO_ARGUMENT,       null, 'h');
     longopts[i++]  = new LongOpt("IOR",                   LongOpt.REQUIRED_ARGUMENT, null, 'I');
+    longopts[i++]  = new LongOpt("URL",                   LongOpt.REQUIRED_ARGUMENT, null, 'u');
     longopts[i++]  = new LongOpt("file",                  LongOpt.REQUIRED_ARGUMENT, null, 'f');
     longopts[i++]  = new LongOpt("collection",            LongOpt.REQUIRED_ARGUMENT, null, 'c');
@@ -392 +443 @@
     Getopt g = new Getopt("org.nzdl.gsdl.SimpleClient",
                           args,
-                          "hI:f:c:aq:dv:Q",
+                          "hI:f:c:aq:dv:Qu:",
                           longopts);
     int c;
@@ -405 +456 @@
         case 'I':
       IORFromCommandLine = g.getOptarg();
+          break;
+        case 'u':
+      URLFromCommandLine = g.getOptarg();
           break;
         case 'f':