/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 653

Added by berkley almost 24 years ago

added support for the server to return the docid of the newly added data file. Also, now the data stream must be prefixed with the following information: filename <0> sessionid <0> filesize <0>. where the <0> symbol is a byte containing zero. The filesize is sent as an int and the filename and sessionid are sent as strings (in byte form).

+      {
         ServerSocket server = null;
         Socket client = null;
         OutputStreamWriter osw = null;
         try
+        {
           //System.out.println("Starting on port " + port);
-...
           client = server.accept();
           //System.out.println("Accepted from " + client.getInetAddress());
           InputStream in = client.getInputStream();
           OutputStreamWriter osw = new OutputStreamWriter(client.getOutputStream());
           InputStream in = client.getInputStream();      //in from the client
           OutputStream sout = client.getOutputStream();  //out to the client
           osw = new OutputStreamWriter(sout);
           //System.out.println("output stream received");
           // first read to get the file name
           byte[] str = new byte[1024];
           int val = -1;
           int i = 0;
           //get the filename
           while (val!=0)
           while (val != 0)
+          {
             //System.out.println("i: " + i);
             val = in.read();
-...
           i = 0;
           str = new byte[1024];
           //get the session id
           while (val!=0)
           while (val != 0)
+          {
             val = in.read();
             str[i] = (byte)val;
             i++;
+          }
           String session_id = (new String(str,0, i-1)).trim();
           //System.out.println("session_id: " + session_id);
           //get the length of the file in bytes
           int val2 = -1;
           long fsize = 0;
           while(val2 != 0)
+          {
             val2 = in.read();
             if(val2 != 0)
+            {
               fsize = val2;
+            }
+          }
           //System.out.println("file size: " + fsize);
           if(!sess_id.equals(session_id))
           {//this is an unauthorized connection to this port
             System.out.println("unauthorized request");
-...
             String accnum = anum.generate(null, "INSERT");
             //osw.write(restext,0,restext.length());
             //osw.flush();
             FileOutputStream out = new FileOutputStream(outfile);
             byte[] buf = new byte[1024];
             int cnt = 0;
             while (cnt!=-1)
             int j = 0;
             while (j < fsize)
+            {
               //System.out.println("1 j:" + j);
               cnt = in.read(buf, 0, 1024);
               if (cnt!=-1)
+              {
                 out.write(buf, 0, cnt);
+              }
               j += cnt;
+            }
             out.flush();
             out.close();
             //put the new document info into the DB
             updateDB(accnum, filename, user);
             //System.out.println("sending new docid: " + accnum);
             osw.write("<?xml version=\"1.0\"?><docid>" + accnum + "</docid>");
             osw.flush();
             osw.close();
             //System.out.println("docid sent");
+          }
           catch(Exception e)
+          {
             System.out.println("error in DataFileServer.run(): " + e.getMessage());
             try
+            {
               osw.write("<?xml version=\"1.0\"?><error>" + e.getMessage() +
                         "</error>");
               osw.flush();
               osw.close();
+            }
             catch(Exception ee)
+            {
               System.out.println("error: " + ee.getMessage());
+            }
             e.printStackTrace(System.out);
+          }
+        }
-...
         catch (IOException ex)
+        {
           ex.printStackTrace();
           try
+          {
             osw.write("<?xml version=\"1.0\"?><error>" + ex.getMessage() +
                       "</error>");
             osw.flush();
             osw.close();
+          }
           catch(Exception ee)
+          {
             System.out.println("error: " + ee.getMessage());
+          }
+        }
         finally
+        {

         Socket echoSocket = null;
         OutputStream out = null;
         InputStream in = null;
         DataOutputStream dsout = null;
         InputStreamReader isr = null;
     		String res = "return";
-...
             echoSocket = DataFileServer.getSocket(host, port);
+          }
           //echoSocket = new Socket(host, port);
           out = echoSocket.getOutputStream();
           in = echoSocket.getInputStream();
           out = echoSocket.getOutputStream(); //out to the server
           in = echoSocket.getInputStream();   //in from server
           isr = new InputStreamReader(in);
+        }
         catch (UnknownHostException e)
+        {
-...
         try
+        {
           File file = new File(filename);
           DataOutputStream dsout = new DataOutputStream(out);
           dsout = new DataOutputStream(out);
           FileInputStream fs = new FileInputStream(file);
           // first convert the filename to a byte array
           String fn = file.getName();
-...
+          }
           dsout.write(0);
           //write the length of the file followed by a 0
           long flength = file.length();
           //System.out.println("file sized (B): " + flength);
           dsout.write((int)flength);
           dsout.write(0);
           dsout.flush();
           // now read response from server
           InputStreamReader isr = new InputStreamReader(in);
           //InputStreamReader isr = new InputStreamReader(in);
           BufferedReader rin = new BufferedReader(isr);
           // now send the file data
-...
           while (cnt!=-1)
+          {
             cnt = fs.read(buf);
             System.out.println("i = "+ i +" Bytes read = " + cnt);
             //System.out.println("i = "+ i +" Bytes read = " + cnt);
             if (cnt!=-1)
+            {
               dsout.write(buf, 0, cnt);
-...
+          }
           fs.close();
           dsout.flush();
           dsout.close();
           //dsout.close();
+    	  }
     	  catch (Exception w)
+        {
           System.out.println("error in DataStreamTest: " + w.getMessage());
+        }
         try
+        {
           while(!isr.ready())
+          {
             //System.out.println("not ready");
+          }
           int msg = isr.read();
           System.out.print("Message from server: ");
           while(msg != -1)
+          {
             System.out.print((char)msg);
             System.out.flush();
             msg = isr.read();
+          }
           System.out.println();
           dsout.flush();
           dsout.close();
+        }
         catch(Exception e)
+        {
           System.out.println("error: " + e.getMessage());
+        }
     	  return res;
+    	}
-...
           String protocol = "http://";
           String host = "alpha.nceas.ucsb.edu";
           String server = protocol + host + servlet;
           String filename = "/home/berkley/xmltodb/test.dat";
           String filename = null;
           if(args.length == 0)
+          {
             filename = "/home/berkley/xmltodb/test.dat";
+          }
           else
+          {
             filename = args[0];
+          }
           //login url
           String u1str = server + "?action=login&username=higgins&password" +
                           "=neetar&qformat=xml";
           System.out.println("u1: " + u1str);
           System.out.println("url 1: " + u1str);
           URL u1 = new URL(u1str);
           HttpMessage msg = new HttpMessage(u1);
           msg.sendPostMessage();
           String cookie = msg.getCookie();
           //get the port to send the data to
           System.out.println("u2: " + server + "?action=getdataport");
           System.out.println("url 2: " + server + "?action=getdataport");
           URL u2 = new URL(server + "?action=getdataport");
           HttpMessage msg2 = new HttpMessage(u2);
           InputStream in = msg2.sendPostMessage();
-...
           System.out.println("error in main: " + e.getMessage());
           e.printStackTrace(System.out);
+        }
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 653

Added by berkley almost 24 years ago