tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-10-04 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* 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
This commit is contained in:
mdtrooper 2011-10-05 12:43:50 +00:00
parent 67b703a844
commit b6e18e641c
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,4 +1,13 @@
2011-10-04 Miguel de Dios <miguel.dedios@artica.es> 2011-10-04 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es>
* res/values/arrays.xml, res/values-en/arrays.xml, * res/values/arrays.xml, res/values-en/arrays.xml,
res/values-es/arrays.xml: disabled the element search "all events" for the res/values-es/arrays.xml: disabled the element search "all events" for the
actual version Pandora API. actual version Pandora API.

2
extras/pandroid_event_viewer/res/values-en/arrays.xml
View File

@ -52,7 +52,7 @@
<!-- You must subtract -1 --> <!-- You must subtract -1 -->
<!--<item>All event</item>//The next version re-add please --> <!--<item>All event</item>//The next version re-add please -->
<!-- You must subtract -2 --> <!-- You must subtract 0 -->
<item>Only new</item> <item>Only new</item>
<item>Only validated</item> <item>Only validated</item>
<item>Only in process</item> <item>Only in process</item>

2
extras/pandroid_event_viewer/res/values-es/arrays.xml
View File

@ -52,7 +52,7 @@
<!-- You must subtract -1 --> <!-- You must subtract -1 -->
<!--<item>Todo los eventos</item> //The next version re-add please --> <!--<item>Todo los eventos</item> //The next version re-add please -->
<!-- You must subtract -2 --> <!-- You must subtract 0 -->
<item>Solo los nuevos</item> <item>Solo los nuevos</item>
<item>Solo los validados</item> <item>Solo los validados</item>
<item>Solo los en proceso</item> <item>Solo los en proceso</item>

2
extras/pandroid_event_viewer/res/values/arrays.xml
View File

@ -52,7 +52,7 @@
<!-- You must subtract -1 --> <!-- You must subtract -1 -->
<!--<item>All event</item>//The next version re-add please --> <!--<item>All event</item>//The next version re-add please -->
<!-- You must subtract -2 --> <!-- You must subtract 0 -->
<item>Only new</item> <item>Only new</item>
<item>Only validated</item> <item>Only validated</item>
<item>Only in process</item> <item>Only in process</item>

8
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
View File

@ -294,12 +294,12 @@ public class Main extends Activity {
} }
combo = (Spinner) findViewById(R.id.severity_combo); combo = (Spinner) findViewById(R.id.severity_combo);
//this.object.severity = combo.getSelectedItemPosition() - 1;//The next version re-add please this.object.severity = combo.getSelectedItemPosition() - 1;
this.object.severity = combo.getSelectedItemPosition() - 2;
combo = (Spinner)findViewById(R.id.status_combo); combo = (Spinner)findViewById(R.id.status_combo);
Log.e("Main search_form", "status_combo = " + combo.getSelectedItemPosition()); 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); text = (EditText)findViewById(R.id.event_search_text);
this.object.eventSearch = text.getText().toString(); this.object.eventSearch = text.getText().toString();
@ -341,7 +341,7 @@ public class Main extends Activity {
combo = (Spinner)findViewById(R.id.status_combo); combo = (Spinner)findViewById(R.id.status_combo);
//filterStatus = combo.getSelectedItemPosition() - 1;//The next version re-add please //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); combo = (Spinner)findViewById(R.id.max_time_old_event_combo);
filterLastTime = combo.getSelectedItemPosition(); filterLastTime = combo.getSelectedItemPosition();

4
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
View File

@ -337,6 +337,10 @@ public class PandroidEventviewerActivity extends TabActivity implements Serializ
return_api = Core.convertStreamToString(entityResponse.getContent()); return_api = Core.convertStreamToString(entityResponse.getContent());
return_api = return_api.replaceAll("\\<.*?\\>", ""); //Clean html tags. 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); Log.e("return_api", return_api);
String[] lines = return_api.split("\n"); String[] lines = return_api.split("\n");