availabillity function added, must add fragment for ui display

diff --git a/Open-ILS/src/Android/bin/EvergreenApp.apk b/Open-ILS/src/Android/bin/EvergreenApp.apk
index 6f46326..42b770b 100644 (file)
Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ

diff --git a/Open-ILS/src/Android/bin/classes.dex b/Open-ILS/src/Android/bin/classes.dex
index 4db0265..c4ec542 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class
index 5db7a1d..861bcf8 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class
index c47f25e..fe41231 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class
index 65b45c3..3afc559 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class
index 47f363e..f2e4f92 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class
index d404876..8cdfbd5 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class
index dd2ced1..e76b867 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class
index 7b6b75a..dc1d338 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class
index a29bc59..b87a6c2 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class differ

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 3d613b4..a7f7f15 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
@@ -50,7 +50,7 @@ public class SearchCatalog {
        */
        public static String METHOD_COPY_LOCATION_COUNTS = "open-ils.search.biblio.copy_location_counts.summary.retrieve";
 
-       
+       public static SearchCatalog searchCatalogSingleton = null;
        /** The conn. */
        public HttpConnection conn;
        
@@ -60,25 +60,32 @@ public class SearchCatalog {
        
        //the org on witch the searches will be made
        /** The selected organization. */
-       private Organisation selectedOrganization = null;
-       
-       private Context context;
-       
+       public Organisation selectedOrganization = null;
+
        public Integer offset;
        
        public Integer visible;
        
        public Integer searchLimit = 10;
        
+       
+       
+       public static SearchCatalog getInstance(){
+               
+               if(searchCatalogSingleton == null){
+                       searchCatalogSingleton = new SearchCatalog();
+               }
+               
+               return searchCatalogSingleton;
+       }
        /**
         * Instantiates a new search catalog.
         *
         * @param httpAddress the http address
         * @param locale the locale
         */
-       public SearchCatalog(Context context) {
+       private SearchCatalog() {
                super();
-               this.context = context;
                try{
                        // configure the connection
                        conn = new HttpConnection(GlobalConfigs.httpAddress+"/osrf-gateway-v1");
@@ -265,6 +272,13 @@ public class SearchCatalog {
        }
 
        
+       public Object getLocationCount(Integer recordID, Integer orgID, Integer orgDepth){
+               
+               List<?> list = (List<?>)Utils.doRequest(conn, SERVICE, METHOD_COPY_LOCATION_COUNTS, new Object[]{recordID, orgID, orgDepth});
+               
+               return list;
+       }
+       
        /**
         * Select organisation.
         *

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 42127c6..677e9a2 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -78,7 +78,7 @@ public class SearchCatalogListView extends Activity{
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         
         context = this;
-        search = new SearchCatalog(this);
+        search = SearchCatalog.getInstance();
                 
         recordList= new ArrayList<RecordInfo>();
 
@@ -179,7 +179,8 @@ public class SearchCatalogListView extends Activity{
                                Intent intent = new Intent(getBaseContext(),TabsView.class);
                                //serialize object and pass it to next activity
                                intent.putExtra("recordInfo", info);
-                               
+                               intent.putExtra("orgID",search.selectedOrganization.id);
+                               intent.putExtra("depth",(search.selectedOrganization.level-1));
                                startActivity(intent);
                        }
                }

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
index 37f06f1..f3063ed 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
@@ -17,6 +17,8 @@ public class TabsView extends BaseSampleActivity {
     private static final String[] CONTENT = new String[] { "Details", "Advanced"};
 
     
+    private SearchCatalog search;
+    
     private RecordInfo record;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,9 +27,15 @@ public class TabsView extends BaseSampleActivity {
 
         record = (RecordInfo) getIntent().getSerializableExtra("recordInfo");
                
+        Integer orgID = getIntent().getIntExtra("orgID", -1);
+        Integer orgDepth = getIntent().getIntExtra("depth", -1);
         
         mAdapter = new SearchFragmentAdapter(getSupportFragmentManager());
 
+        search = SearchCatalog.getInstance();
+        search.getLocationCount(record.doc_id, orgID, orgDepth);
+        
+        
         
         //mAdapter.getItem(0).