Changeset 2924

Timestamp:

2002-01-30T02:09:44+13:00 (22 years ago)

Author:

cs025

Message:

Added the ability to directly state a host URL.

File:

• trunk/java-client/org/nzdl/gsdl/util/NzdlHosts.java (modified) (3 diffs)

trunk/java-client/org/nzdl/gsdl/util/NzdlHosts.java

@@ -122 +122 @@
   }
 
-  static public String getUrl(String code)
-  {
-    return "http://" + getHost(code) + "/cgi-bin/getior";
-  }
+  static public String getUrlFromSite(String sitename)
+  {
+    return "http://" + sitename + "/cgi-bin/getior";
+  }
+
+  static public String getUrlFromCode(String code)
+  {
+    return "http://" + getFullName(code) + "/cgi-bin/getior";
+  }
+
+    static String getIOR(URL url)
+    {
+    try {
+        InputStream his = url.openStream();
+        DataInputStream dhis = new DataInputStream(his) ;
+        String ior = dhis.readLine();
+        System.out.println(ior);
+        return ior;
+    }
+    catch (Throwable throwable) {
+        System.err.println("NzdlHosts:getIOR() unable to communicate with URL \"" + url + "\"");
+    }
+    return "";
+    }
 
   static public String getIOR(String code)
@@ -132 +152 @@
       singleton = new NzdlHosts();
 
-    String str = getUrl(code);
+    String str = getUrlFromCode(code);
     String ior = null;
+    URL    url;
 
     try { 
-      URL url = new URL(str);
-      InputStream his = url.openStream();
-      DataInputStream dhis = new DataInputStream(his) ;
-      ior = dhis.readLine();
-      return ior;
-    } catch (Throwable throwable) {
+    url = new URL(str);
+    }
+    catch (Throwable malEx) {
       System.err.println("NzdlHosts::getIOR() unable to construct or read URL \"" +
-             str + "\", \"" + ior + "\": " + throwable);
+             str + "\", \"" + ior + "\": " + malEx);
       return "";
     }
+
+    return getIOR(url);
   }
 
@@ -156 +176 @@
       System.err.println("NzdlHosts::getHost() constructing NzdlServiceClient(" + 
                code + ") " + throwable);
+    }
+    return nzdl;
+  }
+
+  static public NzdlService getSite(String sitename) {
+    NzdlService nzdl = null;
+
+    try {
+    String siteUrl = getUrlFromSite(sitename);
+    URL url = new URL(siteUrl);
+      nzdl = new NzdlServiceClient(null,null,getIOR(url));
+    } catch (Throwable throwable) {
+      System.err.println("NzdlHosts::getHost() constructing NzdlServiceClient(" + 
+               sitename + ") " + throwable);
     }
     return nzdl;