bug fixes

[IRC.git] / Robust / src / Benchmarks / WebServer / WebServerSocket.java

diff --git a/Robust/src/Benchmarks/WebServer/WebServerSocket.java b/Robust/src/Benchmarks/WebServer/WebServerSocket.java
index c985b4a2bdff7123f8e712b54c3ffed0accc6a2d..8fa20041f8400d11ef9cad8f44a71fb9cca2181b 100644 (file)
--- a/Robust/src/Benchmarks/WebServer/WebServerSocket.java
+++ b/Robust/src/Benchmarks/WebServer/WebServerSocket.java
@@ -28,7 +28,7 @@ public class WebServerSocket extends Socket {
        
        // Send the html file , read from file one byte at a time       
        public void sendfile() {
-               StringBuffer req_file = new StringBuffer("./Tests/htmlfiles/");
+               StringBuffer req_file = new StringBuffer("./htmlfiles/");
                req_file.append(filename);
                String filepath = new String(req_file);
                FileInputStream def_file = new FileInputStream(filepath);
@@ -75,7 +75,6 @@ public class WebServerSocket extends Socket {
                    int index = prefix.indexOf('/');//Parse the GET client request to find filename
                    int end = prefix.indexOf('H');
                    filename = prefix.subString((index+1), (end-1));
-                   System.printString("\n");
                    return true;
                }
                return false;
@@ -95,51 +94,48 @@ public class WebServerSocket extends Socket {
        //kind of operation, name of item, quantity of item, price of item
        //e.g. trans_add_car_2_10000 is the filename
        //store in the parsed[] string , add,car,2,1000
-       public int parseTransaction(){
-               int start = filename.indexOf('_');
-               String s = filename.subString(start+1);
-
-               if (s.startsWith("add")==true){
-       //              System.printString("DEBUG > ADD\n");
-                       int i1 = s.indexOf('_');
-                       parsed[0] = new String(s.subString(0,i1));
-
-                       String s1 = s.subString(i1+1);
-                       int i2 = s1.indexOf('_');
-                       parsed[1] = new String(s1.subString(0,i2));
-                       
-                       String s2 = s1.subString(i2+1);
-                       int i3 = s2.indexOf('_');
-                       parsed[2] = new String(s2.subString(0,i3));
-                       
-                       String s3 = s2.subString(i3+1);
-                       parsed[3] = s3;
-                       
-                       return 0;
-                       
-               }
-               if (s.startsWith("buy")==true){
-       //              System.printString("DEBUG > BUY\n");
-                       int i1 = s.indexOf('_');
-                       parsed[0] = s.subString(0,i1);
-
-                       String s1 = s.subString(i1+1);
-                       int i2 = s1.indexOf('_');
-                       parsed[1] = s1.subString(0,i2);
-                       
-                       String s2 = s1.subString(i2+1);
-                       parsed[2] = s2;
-                       
-                       parsed[3] = "";
-               
-                       return 1;
-               }
-               if (s.startsWith("inventory")==true){
-       //              System.printString("DEBUG > INVENTORY\n");
-                       return 2;
-
-               }
-               // Error transaction
-               return -1;
+    public int parseTransaction(){
+       int start = filename.indexOf('_');
+       String s = filename.subString(start+1);
+       
+       if (s.startsWith("add")==true){
+           //          System.printString("DEBUG > ADD\n");
+           int i1 = s.indexOf('_');
+           parsed[0] = new String(s.subString(0,i1));
+           
+           int i2 = s.indexOf('_',i1+1);
+           parsed[1] = new String(s.subString(i1+1,i2));
+           
+           int i3 = s.indexOf('_',i2+1);
+           parsed[2] = new String(s.subString(i2+1,i3));
+           
+           String s3 = s.subString(i3+1);
+           parsed[3] = s3;
+           
+           return 0;
+           
+       }
+       if (s.startsWith("buy")==true){
+           //          System.printString("DEBUG > BUY\n");
+           int i1 = s.indexOf('_');
+           parsed[0] = s.subString(0,i1);
+           
+           int i2 = s.indexOf('_', i1+1);
+           parsed[1] = s.subString(i1+1,i2);
+           
+           String s2 = s.subString(i2+1);
+           parsed[2] = s2;
+           
+           parsed[3] = "";
+           
+           return 1;
+       }
+       if (s.startsWith("inventory")==true){
+           //          System.printString("DEBUG > INVENTORY\n");
+           return 2;
+           
        }
+       // Error transaction
+       return -1;
+    }
 }