client/app/components/app_service.js
changeset 197 8b87432acffc
parent 184 4d01c2d04359
--- a/client/app/components/app_service.js	Wed Dec 02 11:41:53 2015 +0100
+++ b/client/app/components/app_service.js	Wed Dec 02 18:07:42 2015 +0100
@@ -1,7 +1,7 @@
 
 (function(){
     'use strict';
-    
+
     angular.module('ammicoCommon', ['ngRoute'])
     .factory('Book', function($resource, context) {
         var books = $resource(context.urls.ammicoUrl+'books/:idBook', {idBook:'@id', idExpo: context.idExpo}, {update: { method: 'PUT'}});
@@ -9,7 +9,7 @@
     })
     .factory('Slide', function($resource, context, $modal) {
         var slides = $resource(context.urls.ammicoUrl+'slides/:idSlide', {idSlide:'@id'}, {update: { method: 'PUT'}});
-        
+
         angular.extend(slides.prototype, {
 
             toggleFavorite: function () {
@@ -51,7 +51,7 @@
                 }
             }
         });
-        
+
         return slides;
     })
     .factory('Order', function($resource, context) {
@@ -74,7 +74,7 @@
     })
     .service('searchApi', function($resource, context) {
         this.searchResource = function(params){
-            return $resource(context.urls.searchUrl,  
+            return $resource(context.urls.searchUrl,
                     {
                 callback: 'JSON_CALLBACK'
                     },
@@ -84,35 +84,20 @@
                             params: params,
                             isArray: false,
                             transformResponse: function(data){
-                                var i, j;
-                                // Transform meta list into meta dict
-                                if (typeof data.hits !== 'undefined'){
-                                    var nb = data.hits.length;
-                                    for(i=0;i<nb;i++){
-                                        var nb_metas = data.hits[i].metas.length;
-                                        data.hits[i].metas_dict = {};
-                                        for(j=0;j<nb_metas;j++){
-                                            if(typeof data.hits[i].metas[j].images==='undefined'){
-                                                data.hits[i].metas_dict[data.hits[i].metas[j].name] = data.hits[i].metas[j].value;
-                                            }
-                                            else{
-                                                data.hits[i].metas_dict.images = data.hits[i].metas[j].images[0].value;
-                                            }
-                                        }
-                                    }
-                                    return data;   
+                              if (data.success){
+                                data = data.response[0];
+                                for (var i=0; i<data.count; i++){
+                                  data.collect[i].name = data.collect[i].name || data.collect[i].title_stop || '';
+                                  data.collect[i].description = data.collect[i].description_record || data.collect[i].description_stop || '';
+                                  data.collect[i].url = data.collect[i].url_cnhi || '';
+                                  data.collect[i].date = data.collect[i].displaydates || '';
+                                  data.collect[i].id_stop = data.collect[i].id_stop || '';
+                                  data.collect[i].inventorynumber = data.collect[i].inventorynumber || '';
+                                  data.collect[i].tags = data.collect[i].tags_stop || [];
+                                  data.collect[i].images = data.collect[i].images || [];
                                 }
-                                if (typeof data.response !== 'undefined'){
-                                    var result = [];
-
-                                    angular.forEach(data.response[0].collect, function(value) {
-                                        var temp = {};
-                                        angular.forEach(value, function(value2, key2) {
-                                            temp[key2]= value2;
-                                        });
-                                        result.push(temp);
-                                    });
-                                }
+                              }
+                              return data;
                             }
                         }
                     });
@@ -136,5 +121,5 @@
             }
         };
     });
-    
+
 })();