Changeset 23906 for gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/server/ServerSideTests.java

Timestamp:

2011-04-15T13:38:25+12:00 (13 years ago)

Author:

sjm84

Message:

Committing most recent version of ATLAS

Location:

gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas

Files:

• . (added)
• server (moved) (moved from gs3-extensions/atlas-src/trunk/src/org/greenstone/server )
• server/ServerSideTests.java (modified) (11 diffs)

gs3-extensions/atlas-src/trunk/src/org/greenstone/atlas/server/ServerSideTests.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
-import java.awt.FlowLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -9 +8 @@
 import java.io.BufferedWriter;
 import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -28 +18 @@
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.HashMap;
 import java.util.TreeMap;
 
-import javax.servlet.Servlet;
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
@@ -47 +34 @@
 import org.greenstone.client.Place;
 
-import com.sun.xml.internal.ws.wsdl.writer.document.soap.Body;
-
 public class ServerSideTests
 {
@@ -69 +54 @@
     public void go()
     {
+        DatabaseFix();
+        //PlacesToPoints();
         // ExperimentSetUp();
         //PrecisionExperiment();
@@ -74 +61 @@
         //GazetteerTest();
         //ModPlaceNames();
-        analyseResults();
+        //analyseResults();
     }
     
@@ -488 +475 @@
                 //BufferedReader file = new BufferedReader(new FileReader("/home/sam/Desktop/Research/GNSDocs/" + filenames[i] + ".html"));
 
-                ArrayList<ArrayList<String>> lines = new ArrayList<ArrayList<String>>();
                 StringBuilder text = new StringBuilder();
                 String line = null;
@@ -682 +668 @@
             while ((line = in.readLine()) != null)
             {   
-                if (line == null)
-                {
-                    return;
-                }
-
                 for (String word : line.split(" "))
                 {
@@ -740 +721 @@
         {
             Class.forName("org.postgresql.Driver");
-            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "sam", "password");
+            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "postgres", "admin");
 
             database = c.createStatement();
@@ -775 +756 @@
         {
             Class.forName("org.postgresql.Driver");
-            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "postgres", "password");
+            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "postgres", "admin");
 
             database = c.createStatement();
 
-            BufferedReader gazetteerFile = new BufferedReader(new FileReader("/home/sam/Desktop/Research/Greenstone3-gate-svn2/web/GPNMS/dataen.txt"));
+            BufferedReader gazetteerFile = new BufferedReader(new FileReader("C:\\Users\\sjm84\\Desktop\\EclipseWorkspace\\ATLAS\\war\\dataen.txt"));
 
             String line = "";
@@ -876 +857 @@
         {
             Class.forName("org.postgresql.Driver");
-            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "sam", "password");
+            Connection c = DriverManager.getConnection("jdbc:postgresql://localhost/GS3MapDB", "postgres", "admin");
 
             database = c.createStatement();