From b6e18e641c4cecbb710143194b493c4e977150e8 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 5 Oct 2011 12:43:50 +0000 Subject: [PATCH] 2011-10-04 Miguel de Dios * src/pandroid_event_viewer/pandorafms/Main.java: fixed the status value posprocess. * res/values/arrays.xml, res/values-en/arrays.xml, res/values-es/arrays.xml: added comment with this change. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5041 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/pandroid_event_viewer/ChangeLog | 9 +++++++++ extras/pandroid_event_viewer/res/values-en/arrays.xml | 2 +- extras/pandroid_event_viewer/res/values-es/arrays.xml | 2 +- extras/pandroid_event_viewer/res/values/arrays.xml | 2 +- .../src/pandroid_event_viewer/pandorafms/Main.java | 8 ++++---- .../pandorafms/PandroidEventviewerActivity.java | 4 ++++ 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog index 04f3fd8abe..7b37247ac4 100644 --- a/extras/pandroid_event_viewer/ChangeLog +++ b/extras/pandroid_event_viewer/ChangeLog @@ -1,4 +1,13 @@ 2011-10-04 Miguel de Dios + + * src/pandroid_event_viewer/pandorafms/Main.java: fixed the status value + posprocess. + + * res/values/arrays.xml, res/values-en/arrays.xml, res/values-es/arrays.xml: + added comment with this change. + +2011-10-04 Miguel de Dios + * res/values/arrays.xml, res/values-en/arrays.xml, res/values-es/arrays.xml: disabled the element search "all events" for the actual version Pandora API. diff --git a/extras/pandroid_event_viewer/res/values-en/arrays.xml b/extras/pandroid_event_viewer/res/values-en/arrays.xml index 494accaa0a..22f3e5fd4c 100644 --- a/extras/pandroid_event_viewer/res/values-en/arrays.xml +++ b/extras/pandroid_event_viewer/res/values-en/arrays.xml @@ -52,7 +52,7 @@ - + Only new Only validated Only in process diff --git a/extras/pandroid_event_viewer/res/values-es/arrays.xml b/extras/pandroid_event_viewer/res/values-es/arrays.xml index b81493e2b1..9b7a2dbbd3 100644 --- a/extras/pandroid_event_viewer/res/values-es/arrays.xml +++ b/extras/pandroid_event_viewer/res/values-es/arrays.xml @@ -52,7 +52,7 @@ - + Solo los nuevos Solo los validados Solo los en proceso diff --git a/extras/pandroid_event_viewer/res/values/arrays.xml b/extras/pandroid_event_viewer/res/values/arrays.xml index 494accaa0a..22f3e5fd4c 100644 --- a/extras/pandroid_event_viewer/res/values/arrays.xml +++ b/extras/pandroid_event_viewer/res/values/arrays.xml @@ -52,7 +52,7 @@ - + Only new Only validated Only in process diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java index af0b31af74..c352b2b0ca 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java @@ -294,12 +294,12 @@ public class Main extends Activity { } combo = (Spinner) findViewById(R.id.severity_combo); - //this.object.severity = combo.getSelectedItemPosition() - 1;//The next version re-add please - this.object.severity = combo.getSelectedItemPosition() - 2; + this.object.severity = combo.getSelectedItemPosition() - 1; combo = (Spinner)findViewById(R.id.status_combo); Log.e("Main search_form", "status_combo = " + combo.getSelectedItemPosition()); - this.object.status = combo.getSelectedItemPosition() - 1; + //this.object.status = combo.getSelectedItemPosition() - 1;//The next version re-add please + this.object.status = combo.getSelectedItemPosition() - 0; text = (EditText)findViewById(R.id.event_search_text); this.object.eventSearch = text.getText().toString(); @@ -341,7 +341,7 @@ public class Main extends Activity { combo = (Spinner)findViewById(R.id.status_combo); //filterStatus = combo.getSelectedItemPosition() - 1;//The next version re-add please - filterStatus = combo.getSelectedItemPosition() - 2; + filterStatus = combo.getSelectedItemPosition() - 0; combo = (Spinner)findViewById(R.id.max_time_old_event_combo); filterLastTime = combo.getSelectedItemPosition(); diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java index 694e2b6160..2c44438d9d 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java @@ -337,6 +337,10 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ return_api = Core.convertStreamToString(entityResponse.getContent()); return_api = return_api.replaceAll("\\<.*?\\>", ""); //Clean html tags. + + //Work around for the crap of \n in this event bad xml + return_api = return_api.replaceAll("Unable to process XML data file.*?line 187 thread 5", "Bad XML"); + Log.e("return_api", return_api); String[] lines = return_api.split("\n");