From: drizea <danielrizea27@gmail.com>
Date: Mon, 30 Jul 2012 22:17:22 +0000 (+0300)
Subject: swipe bug fix
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2c8678eeaec1136ed3f12a378b2251ab4513df5a;p=working%2FEvergreen.git

swipe bug fix
---

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
index c95f6726e4..6fdb4f1d81 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
@@ -37,6 +37,10 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
    
         records = (List<RecordInfo>)getIntent().getSerializableExtra("recordList");
         
+        if(records.get(records.size()-1).dummy == true)
+        	records.remove(records.size()-1);
+        
+        
         //header portion actions
         homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
index e692974e27..a3565aed4d 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
@@ -202,12 +202,13 @@ public class SearchCatalog {
 	        	
 	        	//get copy count 
 	        	List<List<Object>> list= (List<List<Object>>)getLocationCount(Integer.parseInt(ids.get(i)), this.selectedOrganization.id, this.selectedOrganization.level-1);
-	        	
-	        	for(int j=0; j<list.size();j++){
-	        		CopyInformation copyInfo = new CopyInformation(list.get(j));
+
+	        	if(list != null)
+	        		for(int j=0; j<list.size();j++){
+	        			CopyInformation copyInfo = new CopyInformation(list.get(j));
 	        		
-	        		record.copyInformationList.add(copyInfo);
-	        	}
+	        			record.copyInformationList.add(copyInfo);
+	        		}
 	        	
 	        	System.out.println("Title " + record.title + " Author " + record.author + " Pub date" + record.pubdate +" Publisher" + record.publisher);
 	        }
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index c2bd9c55ff..f2cb753269 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -381,10 +381,6 @@ public class SearchCatalogListView extends Activity{
 	    			intent.putExtra("orgID",search.selectedOrganization.id);
 	    			intent.putExtra("depth",(search.selectedOrganization.level-1));
 	    			
-	    			if(recordList.get(recordList.size()-1).dummy == true){
-	    				recordList.remove(recordList.size()-1);
-	    			}
-	    			
 	    			intent.putExtra("recordList", recordList);
 	    			//TODO put total number
 	    			intent.putExtra("recordPosition", position);