Changeset 25308 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/txt2usersDB.java

Timestamp:

2012-03-28T15:45:03+13:00 (12 years ago)

Author:

ak19

Message:

1. Updated txt2usersDB.java to compile again and to also work with usersDB2txt.java such that the output of running one becomes the exact input required by the other and vice-versa. So running usersDB2txt and then txt2usersDB on the txt file generated by the former, will generate a DB file that can be fed back into usersDB2txt which will once more produce an identical text output. 2. Created the ChangePwdUsersDB.java file which build.xml's new ant config-admin target calls to reset the admin password.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/txt2usersDB.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/txt2usersDB.java

@@ -38 +38 @@
         dw.connectDatabase(args[1],false);
         boolean delete_rows = dw.deleteAllUser();
+        dw.closeDatabase();
         if (!delete_rows){
         System.out.println("Couldn't delete rows of the users table");
@@ -47 +48 @@
         String accountstatus=null;
         String comment=null;
+        String email=null;
         while ((str = in.readLine()) != null) {
         //ystem.out.println(str);
-        if (str.startsWith("<")){
+        
+        if(str.indexOf(" = ") != -1) { // works with DerbyWrapper.db2txt() and usersDB2txt.java. Fields listed as: USERNAME = admin
+            String field=str.substring(0,str.indexOf(" = "));
+            if (field.equalsIgnoreCase("email")){
+            email=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+            if (field.equalsIgnoreCase("comment")){
+            comment=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+            if (field.equalsIgnoreCase("status")){
+            accountstatus=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+            if (field.equalsIgnoreCase("groups")){
+            groups=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+            if (field.equalsIgnoreCase("password")){
+            //password=dw.rot13(str.substring(str.indexOf(">")+1,str.length()));
+            password=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+            if (field.equalsIgnoreCase("username")){
+            username=str.substring(str.indexOf(" = ")+3,str.length());
+            }
+        }       
+        else if (str.startsWith("<")){ // fields listed as: <username>admin
             String field=str.substring(1,str.indexOf(">"));
+            if (field.equals("email")){
+            email=str.substring(str.indexOf(">")+1,str.length());
+            }
             if (field.equals("comment")){
             comment=str.substring(str.indexOf(">")+1,str.length());
             }
-            if (field.equals("enabled")){
+            if (field.equals("enabled") || field.equals("status")){
             accountstatus=str.substring(str.indexOf(">")+1,str.length());
             }
@@ -61 +89 @@
             }
             if (field.equals("password")){
-            password=dw.rot13(str.substring(str.indexOf(">")+1,str.length()));
+            //password=dw.rot13(str.substring(str.indexOf(">")+1,str.length()));
+            password=str.substring(str.indexOf(">")+1,str.length());
             }
             if (field.equals("username")){
@@ -67 +96 @@
             }
         }
-        if (str.equals("----------------------------------------------------------------------")){
-            if ((username!=null) && (password!=null) && (groups!=null) && (accountstatus!=null) && (comment!=null)){
+        else if (str.equals("----------------------------------------------------------------------")
+             || str.equals("-------------------------------------")) {          
+            
+            if ((username!=null) && (password!=null) && (groups!=null) && (accountstatus!=null) && (comment!=null) && (email!=null)) {
             dw.connectDatabase(args[1],false);
-            dw.addUser(username, password, groups, accountstatus, comment);
+            dw.addUser(username, password, groups, accountstatus, comment, email);
             username=null;
             password=null;
@@ -76 +107 @@
             accountstatus=null;
             comment=null;
-            dw.connectDatabase(args[1],false);
+            email=null;
+            //dw.connectDatabase(args[1],false); // should this be closeDatabase()????
+            dw.closeDatabase();
+            }
+        }
+        else { // encrypted passwords can span multiple lines for some reason
+               // assume that is the case here
+            if(password != null) { 
+            password = password + "\n" + str;
             }
         }