Changeset 134

Timestamp:

02/10/09 16:05:05 (10 months ago)

Author:

dmyung

Message:

added some secret sections for FormReview? for debug data injection

but for real stuff, added a settings file that's generated on startup for the first time, and is persisted in the settings directory to set a preference for ACK replies for parse and no parse events.

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• AndroidManifest.xml (modified) (2 diffs)
• assets/definitions/fields.json (modified) (1 diff)
• res/drawable/rapidandroid.png (added)
• res/layout/global_settings.xml (added)
• res/values/strings.xml (modified) (1 diff)
• src/org/rapidandroid/ApplicationGlobals.java (added)
• src/org/rapidandroid/RapidAndroidApplication.java (modified) (1 diff)
• src/org/rapidandroid/activity/Dashboard.java (modified) (7 diffs)
• src/org/rapidandroid/activity/FormCreator.java (modified) (1 diff)
• src/org/rapidandroid/activity/FormReviewer.java (modified) (4 diffs)
• src/org/rapidandroid/activity/GlobalSettings.java (added)
• src/org/rapidandroid/data/controller/ParsedDataReporter.java (modified) (1 diff)
• src/org/rapidandroid/receiver/SmsParseReceiver.java (modified) (4 diffs)
• unittests/org/rapidandroid/tests/MessageCorpusTests.java (modified) (1 diff)

trunk/rapidandroid/org.rapidandroid/AndroidManifest.xml

@@ -6 +6 @@
 
 
-        <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="RapidAndroidApplication">
+        <application android:label="@string/app_name" android:name="RapidAndroidApplication" android:icon="@drawable/rapidandroid">
                 <provider android:authorities="org.rapidandroid.provider.RapidSms" android:name=".content.RapidSmsContentProvider">
                 </provider>
@@ -63 +63 @@
 </intent-filter>
 </receiver>
+<activity android:name=".activity.GlobalSettings"></activity>
 </application>
 

trunk/rapidandroid/org.rapidandroid/assets/definitions/fields.json

@@ -1 @@
-[{"pk": 1, "model": "rapidandroid.field", "fields": {"fieldtype": 1, "prompt": "Location of distribution center", "name": "Location", "form": 1, "sequence": 1}}, {"pk": 2, "model": "rapidandroid.field", "fields": {"fieldtype": 2, "prompt": "Number of bednets received", "name": "received", "form": 1, "sequence": 2}}, {"pk": 3, "model": "rapidandroid.field", "fields": {"fieldtype": 2, "prompt": "Number of bednets that have been handed out", "name": "given", "form": 1, "sequence": 3}}, {"pk": 4, "model": "rapidandroid.field", "fields": {"fieldtype": 2, "prompt": "Number of bednets that remain in balance", "name": "balance", "form": 1, "sequence": 4}}, {"pk": 5, "model": "rapidandroid.field", "fields": {"fieldtype": 1, "prompt": "Child Identifier (6 digits)", "name": "child_id", "form": 2, "sequence": 1}}, {"pk": 6, "model": "rapidandroid.field", "fields": {"fieldtype": 3, "prompt": "weight", "name": "weight", "form": 2, "sequence": 2}}, {"pk": 7, "model": "rapidandroid.field", "fields": {"fieldtype": 4, "prompt": "height", "name": "height", "form": 2, "sequence": 3}}, {"pk": 8, "model": "rapidandroid.field", "fields": {"fieldtype": 5, "prompt": "ratio", "name": "ratio", "form": 2, "sequence": 4}}, {"pk": 9, "model": "rapidandroid.field", "fields": {"fieldtype": 6, "prompt": "muac", "name": "muac", "form": 2, "sequence": 5}}, {"pk": 10, "model": "rapidandroid.field", "fields": {"fieldtype": 7, "prompt": "Does child suffer from oedema", "name": "oedema", "form": 2, "sequence": 6}}, {"pk": 11, "model": "rapidandroid.field", "fields": {"fieldtype": 7, "prompt": "does the child suffer from diarrhoea", "name": "diarrhoea", "form": 2, "sequence": 7}}]
+[{"pk": 1, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 1, "prompt": "Distribution site location", "name": "Location", "form": 1, "sequence": 1}},
+ {"pk": 2, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 2, "prompt": "Number of bednets received", "name": "received", "form": 1, "sequence": 2}},
+ {"pk": 3, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 2, "prompt": "Number of bednets handed out", "name": "given", "form": 1, "sequence": 3}},
+ {"pk": 4, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 2, "prompt": "Number of bednets in inventory", "name": "balance", "form": 1, "sequence": 4}},
+ {"pk": 5, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 1, "prompt": "Child Identifier (6 digits)", "name": "child_id", "form": 2, "sequence": 1}},
+ {"pk": 6, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 3, "prompt": "weight", "name": "weight", "form": 2, "sequence": 2}},
+ {"pk": 7, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 4, "prompt": "height", "name": "height", "form": 2, "sequence": 3}},
+ {"pk": 8, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 5, "prompt": "ratio", "name": "ratio", "form": 2, "sequence": 4}},
+ {"pk": 9, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 6, "prompt": "muac", "name": "muac", "form": 2, "sequence": 5}},
+ {"pk": 10, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 7, "prompt": "Does child suffer from oedema", "name": "oedema", "form": 2, "sequence": 6}},
+ {"pk": 11, "model": "rapidandroid.field", 
+"fields": {"fieldtype": 7, "prompt": "does the child suffer from diarrhoea", "name": "diarrhoea", "form": 2, "sequence": 7}}]
+

trunk/rapidandroid/org.rapidandroid/res/values/strings.xml

@@ -48 +48 @@
 <string name="rad_last500">Last 500</string>
 <string name="rad_all">All</string>
+<string name="glbsettings_parse_ack">Successful Parse Reply</string>
+<string name="glbsettings_noparse_ack">Failed Parse Reply</string>
+<string name="glb_chk_noparse_text">Reply on failed parses</string>
+<string name="glb_chk_parse_text">Reply on successful parses</string>
+<string name="glbsettings_heading">Global reply settings</string>
 </resources>

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/RapidAndroidApplication.java

@@ -37 +37 @@
                 super.onCreate();
                 // Debug.startMethodTracing("rapidandroid_application");
+                
+                ApplicationGlobals.checkGlobals(this.getApplicationContext());
                 ModelBootstrap.InitApplicationDatabase(this.getApplicationContext());
 

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/Dashboard.java

@@ -71 +71 @@
  * @created Jan 9, 2009
  * 
- * 
- * 
  */
 public class Dashboard extends Activity {
@@ -116 +114 @@
         // private static final int ACTIVITY_DATERANGE = 2;
         private static final int ACTIVITY_CHARTS = 3; // this and ACTIVITY_CHARTS
+        private static final int ACTIVITY_GLOBALSETTINGS = 4;
 
         private static final int MENU_CREATE_ID = Menu.FIRST;
@@ -121 +120 @@
         private static final int MENU_CHANGE_DATERANGE = Menu.FIRST + 2;
         private static final int MENU_CHARTS_ID = Menu.FIRST + 3;
+        private static final int MENU_GLOBAL_SETTINGS = Menu.FIRST + 4;
         // private static final int MENU_SHOW_REPORTS = Menu.FIRST + 3;
         // private static final int MENU_EXIT = Menu.FIRST + 3; //waitaminute, we
@@ -402 +402 @@
                                 beginListViewReload();
                                 break;
+                        case ACTIVITY_GLOBALSETTINGS:
+                                resetCursor = true;
+                                beginListViewReload();
+                                break;
                         // case ACTIVITY_DATERANGE:
                         // if (extras != null) {
@@ -426 +430 @@
                 // R.string.chart_menu_change_parameters.setIcon(android.R.drawable.ic_menu_recent_history);
                 menu.add(0, MENU_CHARTS_ID, 0, R.string.dashboard_menu_view).setIcon(android.R.drawable.ic_menu_sort_by_size);
+                menu.add(0, MENU_GLOBAL_SETTINGS, 0, "Change Settings").setIcon(android.R.drawable.ic_menu_preferences);
                 // menu.add(0, MENU_SHOW_REPORTS, 0,
                 // R.string.dashboard_menu_show_reports);
@@ -449 +454 @@
                                 startActivityChart();
                                 return true;
+                        case MENU_GLOBAL_SETTINGS:
+                                startActivityGlobalSettings();
+                                return true;
                 }
                 return true;
         }
+
+        
 
         @Override
@@ -518 +528 @@
         }
 
+        /**
+         * 
+         */
+        private void startActivityGlobalSettings() {
+                Intent i;
+                i = new Intent(this, GlobalSettings.class);
+                startActivityForResult(i, ACTIVITY_GLOBALSETTINGS);
+                
+        }
+        
         // Start the form edit/create activity
         private void startActivityFormReview() {

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/FormCreator.java

@@ -253 +253 @@
                                         }
                                 } while (checkForFields);
+                                fin.close();                            
                                 f.delete();
                         }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/FormReviewer.java

@@ -22 +22 @@
 package org.rapidandroid.activity;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Random;
+import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -158 +164 @@
                 menu.add(0, MENU_DUMP_CSV, 0, R.string.formreview_dump_csv).setIcon(android.R.drawable.ic_menu_save);
 
-                menu.add(0, MENU_HTTP_UPLOAD, 0, R.string.formreview_upload_csv).setIcon(android.R.drawable.ic_menu_upload);
-
-                menu.add(0, MENU_INJECT_DEBUG, 0, "Generate Data").setIcon(android.R.drawable.ic_menu_manage);
+//              menu.add(0, MENU_HTTP_UPLOAD, 0, R.string.formreview_upload_csv).setIcon(android.R.drawable.ic_menu_upload);
+
+                //menu.add(0, MENU_INJECT_DEBUG, 0, "Generate Data").setIcon(android.R.drawable.ic_menu_manage);
                 return true;
         }
@@ -344 +350 @@
                         @Override
                         public void run() {
-                                doInjection();
+                                if(mForm.getFormName().toLowerCase().equals("bednets")) {
+                                        doCsvDirectBednetsInjection();
+                                } else {
+                                        doRandomizedInjection();
+                                }
                                 mDebugHandler.post(mUpdateResults);
                         }
@@ -351 +361 @@
         }
 
-        private void doInjection() {
+        
+        private void doCsvDirectBednetsInjection() {
+                String rawMessageText = "";
+                
+                try {
+                        InputStream is = this.getAssets().open("testdata/rawdata.csv");
+
+                        int size = is.available();
+
+                        // Read the entire asset into a local byte buffer.
+                        byte[] buffer = new byte[size];
+                        is.read(buffer);
+                        is.close();
+
+                        // Convert the buffer into a Java string.
+                        String text = new String(buffer);
+
+                        rawMessageText = text;
+
+                } catch (IOException e) {
+                        // Should never happen!
+                        throw new RuntimeException(e);
+                }
+
+                
+                StringReader sr = new StringReader(rawMessageText);
+                BufferedReader bufRdr = new BufferedReader(sr);
+
+                String line = null;
+                int row = 0;
+                int col = 0;
+                Vector<String[]> lines = new Vector<String[]>();
+                // read each line of text file
+                try {
+                        while ((line = bufRdr.readLine()) != null) {
+                                StringTokenizer st = new StringTokenizer(line, ",");
+                                int tokCount = st.countTokens();
+
+                                String[] tokenizedLine = new String[tokCount];
+                                int toki = 0;
+                                while (st.hasMoreTokens()) {
+                                        tokenizedLine[toki] = st.nextToken();
+                                        toki++;
+                                }
+                                lines.add(tokenizedLine);
+                        }
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                } finally {
+
+                        try {
+                                sr.close();
+                                bufRdr.close();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                int len = lines.size();
+
+                for (int i = 0; i < len; i++) {
+                        String[] csvline = lines.get(i);
+
+                        String datestr = csvline[0];
+
+                        Date dateval = new Date();
+                        try {
+                                dateval = Message.SQLDateFormatter.parse(datestr);
+                        } catch (ParseException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                                
+                        }
+                        String sender = csvline[1];
+                        String text = csvline[2];
+                        
+                        Monitor monitor = MessageTranslator.GetMonitorAndInsertIfNew(this, sender);
+
+                        ContentValues messageValues = new ContentValues();
+                        messageValues.put(RapidSmsDBConstants.Message.MESSAGE, text);
+                        messageValues.put(RapidSmsDBConstants.Message.MONITOR, monitor.getID());
+
+                        messageValues.put(RapidSmsDBConstants.Message.TIME, Message.SQLDateFormatter.format(getRandomDate()));
+                        messageValues.put(RapidSmsDBConstants.Message.RECEIVE_TIME, Message.SQLDateFormatter.format(dateval));
+                        messageValues.put(RapidSmsDBConstants.Message.IS_OUTGOING, false);
+
+                        Uri msgUri = null;
+                        
+                        msgUri = this.getContentResolver().insert(RapidSmsDBConstants.Message.CONTENT_URI, messageValues);
+                        Vector<IParseResult> results = ParsingService.ParseMessage(mForm, text);
+                        ParsedDataTranslator.InsertFormData(this, mForm, Integer.valueOf(msgUri.getPathSegments().get(1))
+                                                                                                                                                        .intValue(), results);
+                }
+
+
+
+        }
+        
+        private void doRandomizedInjection() {
                 Random r = new Random();
 

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/data/controller/ParsedDataReporter.java

@@ -141 +141 @@
 
                 Cursor cr = mHelper.getReadableDatabase().rawQuery(query.toString(), null);
-
-                File sdcard = Environment.getExternalStorageDirectory();
-                File destinationdir = new File(sdcard, "rapidandroid/exports");
-                destinationdir.mkdir();
-                Date now = new Date();
-                File destinationfile = new File(destinationdir, "formdata_" + f.getPrefix() + now.getYear() + now.getMonth()
-                                + now.getDate() + "-" + now.getHours() + now.getMinutes() + ".csv");
                 FileOutputStream fOut = null;
+                
                 try {
+
+                        File sdcard = Environment.getExternalStorageDirectory();
+                        File destinationdir = new File(sdcard, "rapidandroid/exports");
+                        destinationdir.mkdir();
+                        Date now = new Date();
+                        File destinationfile = new File(destinationdir, "formdata_" + f.getPrefix() + now.getYear()
+                                        + now.getMonth() + now.getDate() + "-" + now.getHours() + now.getMinutes() + ".csv");
+                        
+                
                         destinationfile.createNewFile();
                         fOut = new FileOutputStream(destinationfile);

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/receiver/SmsParseReceiver.java

@@ -24 +24 @@
 import java.util.Vector;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.rapidandroid.ApplicationGlobals;
 import org.rapidandroid.content.translation.MessageTranslator;
 import org.rapidandroid.content.translation.ModelTranslator;
 import org.rapidandroid.content.translation.ParsedDataTranslator;
-
 import org.rapidsms.java.core.model.Form;
 import org.rapidsms.java.core.model.Monitor;
@@ -51 +53 @@
         private static String[] prefixes = null;
         private static Form[] forms = null;
+        
+        
+        private static boolean globalsLoaded = false;
+        private static boolean mReplyParse = true;
+        private static boolean mReplyFail = true;
+        
+        private static String mReplyParseText = "";
+        private static String mReplyFailText = "";
+        
+        
+        public static void initGlobals(Context context) {
+                if(!globalsLoaded) {
+                        JSONObject globals = ApplicationGlobals.loadSettingsFromFile(context);
+                        try {
+                                mReplyParse = globals.getBoolean(ApplicationGlobals.KEY_PARSE_REPLY);
+                                mReplyFail = globals.getBoolean(ApplicationGlobals.KEY_FAILED_REPLY);
+                                mReplyParseText = globals.getString(ApplicationGlobals.KEY_PARSE_REPLY_TEXT);
+                                mReplyFailText = globals.getString(ApplicationGlobals.KEY_FAILED_REPLY_TEXT);
+                                globalsLoaded = true;
+                        } catch (JSONException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+        }
 
         // private Context mContext = null;
@@ -79 +106 @@
         @Override
         public void onReceive(Context context, Intent intent) {
-                // if (mContext == null) {
-                // mContext = context;
-                // }
+                initGlobals(context);
+        
                 if (prefixes == null) {
                         initFormCache(); // profiler shows us that this is being called
@@ -98 +124 @@
                 Form form = determineForm(body);
                 if (form == null) {
-                        Intent broadcast = new Intent("org.rapidandroid.intents.SMS_REPLY");
-                        broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE, intent.getStringExtra("from"));
-                        broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, "Your message could not be parsed");
-                        context.sendBroadcast(broadcast);
+                        
+                        
+                        if (mReplyFail) {
+                                Intent broadcast = new Intent("org.rapidandroid.intents.SMS_REPLY");
+                                broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE, intent.getStringExtra("from"));
+                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, mReplyFailText);
+                                context.sendBroadcast(broadcast);
+                        }
                         return;
                 } else {
                         Monitor mon = MessageTranslator.GetMonitorAndInsertIfNew(context, intent.getStringExtra("from"));
                         // if(mon.getReplyPreference()) {
-                        // if(true) {
-                        // //for debug purposes, we'll just ack every time.
-                        // Intent broadcast = new
-                        // Intent("org.rapidandroid.intents.SMS_REPLY");
-                        // broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE,
-                        // intent.getStringExtra("from"));
-                        // broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE,
-                        // "Message parse successful, thank you!");
-                        // context.sendBroadcast(broadcast);
-                        // }
-
+                        if (mReplyParse) {
+                                // for debug purposes, we'll just ack every time.
+                                Intent broadcast = new Intent("org.rapidandroid.intents.SMS_REPLY");
+                                broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE, intent.getStringExtra("from"));
+                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, mReplyParseText);
+                                context.sendBroadcast(broadcast);
+                        }
                         Vector<IParseResult> results = ParsingService.ParseMessage(form, body);
                         ParsedDataTranslator.InsertFormData(context, form, msgid, results);
-
                 }
         }

trunk/rapidandroid/org.rapidandroid/unittests/org/rapidandroid/tests/MessageCorpusTests.java

@@ -65 +65 @@
                 for (int i = 0; i < forms.length; i++) {
                         prefixes[i] = forms[i].getPrefix();
-                        getContext().getContentResolver().delete(
-                                                                                                                Uri.parse(RapidSmsDBConstants.FormData.CONTENT_URI_PREFIX
+                        getContext().getContentResolver().delete(Uri.parse(RapidSmsDBConstants.FormData.CONTENT_URI_PREFIX
                                                                                                                                 + forms[i].getFormId()), null, null);