Fixed keyword gen part 2

wratner · May 12, 2014 · 19b9270 · 19b9270
1 parent 76bb97a
commit 19b9270
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/build_index_part2.sh b/build_index_part2.sh
@@ -8,3 +8,29 @@
 
 #NOTE:  Your index generation should be in Java.  This should follow the SSE.indexgen described in Figure 8 of paper
 #Call your java code with the arguments here
+
+#java -cp `pwd`/bin mp3.Main ../large illinois 2
+#mkdir large_output
+#echo "Time to place"
+#time java -cp `pwd`/bin mp3.Main ../large illinois 2 blah large_output blah
+
+#echo "time to index"
+#time java -Xmx1024m -cp `pwd`/bin mp3.Main ./large_output illinois 2 indexOnly large_output blah
+
+#echo "Time to encrypt"
+#time java -cp `pwd`/bin mp3.Main ../small illinois 2 blah small_output encrypt
+#mkdir small_output
+
+rm -rf small_output2
+mkdir -p small_output2/keywords
+
+echo "Time to place"
+time java -cp `pwd`/bin mp3.Main ../small illinois 2 blah small_output2 blah
+
+echo "time to index"
+time java -Xmx1024m -cp `pwd`/bin mp3.Main ./small_output2 illinois 2 indexOnly small_output2 blah
+
+echo "Time to encrypt"
+#time java -cp `pwd`/bin mp3.Main ../small illinois 2 blah small_output2 encrypt
+time java -cp `pwd`/bin mp3.CreateBlindStore small_output2 illinois
+
diff --git a/compile_server.sh b/compile_server.sh
@@ -6,5 +6,6 @@
 #javac -d bin src/mp3/*.java
 #javac -d bin -cp `pwd`/bin src/BlindStorageServer.java
 mkdir bin
+#javac -d bin -cp `pwd`/bin/javautil-3.1.1.jar src/mp3/*.java
 javac -d bin src/mp3/*.java
 javac -d bin -cp `pwd`/bin src/BlindStorageServer.java
diff --git a/src/mp3/FileHash.java b/src/mp3/FileHash.java
@@ -199,7 +199,7 @@ public static void addFiletoList(String dirPath) {
 //                        "D:\\temp_CS463\\stopwords.txt"), dirLoc + "keywords");
                     indexer.mapToIndexFiles(indexer.indexMessages(null, dirList,
                             fileList, "./seperators.txt",
-                            "./stopwords.txt"), dirLoc + "keywords");
+                            "./stopwords.txt"), dirLoc + "/" + "keywords");
                 } catch (IOException e) { // TODO Auto-generated catch block
                     e.printStackTrace();
                 }

diff --git a/src/mp3/Indexer.java b/src/mp3/Indexer.java
@@ -344,11 +344,11 @@ public static Boolean mapToIndexFiles(Map<String, Set<String>> map, String index
 
         for (String keyword : map.keySet()) {
             String keywordHash = getHash(keyword);
-            File file = new File(indexPath + "\\" + keywordHash);
+            File file = new File(indexPath + "/" + keywordHash);
             if (file.exists()) {
                 System.err.println("There is a keyword collision!");
             }
-            fileWrite = new FileWriter(indexPath + "\\" + keywordHash, true); //+ encryption.hash(keyword));
+            fileWrite = new FileWriter(indexPath + "/" + keywordHash, true); //+ encryption.hash(keyword));
 
 
             toWrite = keyword + KEYWORD_DELIM;