Explorar o código

Revert "HUE-2870 [libsolr] Protect against precision issues with large ids"

This reverts commit be1b69c2956af9be24b36aa13dd02d16ad228359.
Erick Tryzelaar %!s(int64=10) %!d(string=hai) anos
pai
achega
41c5a00

+ 17 - 30
apps/search/src/search/static/search/js/search.ko.js

@@ -365,7 +365,6 @@ var FieldAnalysis = function (vm, field_name) {
       collection: ko.mapping.toJSON(vm.collection),
       collection: ko.mapping.toJSON(vm.collection),
       analysis: ko.mapping.toJSON(self)
       analysis: ko.mapping.toJSON(self)
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
       if (data.status == 0) {
       if (data.status == 0) {
         if (data.terms != null) {
         if (data.terms != null) {
           $.each(data.terms, function (key, val) {
           $.each(data.terms, function (key, val) {
@@ -380,7 +379,7 @@ var FieldAnalysis = function (vm, field_name) {
         $(document).trigger("error", data.message);
         $(document).trigger("error", data.message);
       }
       }
       self.isLoading(false);
       self.isLoading(false);
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     });
     });
   };
   };
@@ -393,7 +392,6 @@ var FieldAnalysis = function (vm, field_name) {
       query: ko.mapping.toJSON(vm.query),
       query: ko.mapping.toJSON(vm.query),
       analysis: ko.mapping.toJSON(self)
       analysis: ko.mapping.toJSON(self)
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
       if (data.status == 0) {
       if (data.status == 0) {
         if (data.stats.stats.stats_fields[self.name()] != null) {
         if (data.stats.stats.stats_fields[self.name()] != null) {
           $.each(data.stats.stats.stats_fields[self.name()], function (key, val) {
           $.each(data.stats.stats.stats_fields[self.name()], function (key, val) {
@@ -408,7 +406,7 @@ var FieldAnalysis = function (vm, field_name) {
         $(document).trigger("error", data.message);
         $(document).trigger("error", data.message);
       }
       }
       self.isLoading(false);
       self.isLoading(false);
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     });
     });
   };
   };
@@ -651,13 +649,12 @@ var Collection = function (vm, collection) {
     logGA('add_facet/' + facet_json.widgetType);
     logGA('add_facet/' + facet_json.widgetType);
 
 
     $.post("/search/template/new_facet", {
     $.post("/search/template/new_facet", {
-        collection: ko.mapping.toJSON(self),
-        id: facet_json.widget_id,
-        label: facet_json.name,
-        field: facet_json.name,
-        widget_type: facet_json.widgetType
+      "collection": ko.mapping.toJSON(self),
+        "id": facet_json.widget_id,
+        "label": facet_json.name,
+        "field": facet_json.name,
+        "widget_type": facet_json.widgetType
       }, function (data) {
       }, function (data) {
-        data = JSON.bigdataParse(data);
         if (data.status == 0) {
         if (data.status == 0) {
           var facet = ko.mapping.fromJS(data.facet);
           var facet = ko.mapping.fromJS(data.facet);
           facet.properties.limit.subscribe(function () {
           facet.properties.limit.subscribe(function () {
@@ -678,7 +675,7 @@ var Collection = function (vm, collection) {
         } else {
         } else {
           $(document).trigger("error", data.message);
           $(document).trigger("error", data.message);
         }
         }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {});
+    }).fail(function (xhr, textStatus, errorThrown) {});
   };
   };
 
 
   self.addPivotFacetValue = function(facet) {
   self.addPivotFacetValue = function(facet) {
@@ -860,7 +857,6 @@ var Collection = function (vm, collection) {
     $.post("/search/get_collection", {
     $.post("/search/get_collection", {
         name: self.name()
         name: self.name()
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
       if (data.status == 0) {
       if (data.status == 0) {
         self.idField(data.collection.collection.idField);
         self.idField(data.collection.collection.idField);
         self.template.template(data.collection.collection.template.template);
         self.template.template(data.collection.collection.template.template);
@@ -875,7 +871,7 @@ var Collection = function (vm, collection) {
 
 
         self.syncDynamicFields();
         self.syncDynamicFields();
       }
       }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {});
+    }).fail(function (xhr, textStatus, errorThrown) {});
   };
   };
 
 
   function diff(A, B) {
   function diff(A, B) {
@@ -921,7 +917,6 @@ var Collection = function (vm, collection) {
     $.post("/search/get_collection", {
     $.post("/search/get_collection", {
         name: self.name()
         name: self.name()
       }, function (data) {
       }, function (data) {
-        data = JSON.bigdataParse(data);
         if (data.status == 0) {
         if (data.status == 0) {
           self.idField(data.collection.collection.idField);
           self.idField(data.collection.collection.idField);
           syncArray(self.template.fieldsAttributes, data.collection.collection.template.fieldsAttributes, false);
           syncArray(self.template.fieldsAttributes, data.collection.collection.template.fieldsAttributes, false);
@@ -929,19 +924,18 @@ var Collection = function (vm, collection) {
         }
         }
         // After sync the dynamic fields
         // After sync the dynamic fields
         self.syncDynamicFields()
         self.syncDynamicFields()
-    }, "text").fail(function (xhr, textStatus, errorThrown) {});
+    }).fail(function (xhr, textStatus, errorThrown) {});
   };
   };
 
 
   self.syncDynamicFields = function () {
   self.syncDynamicFields = function () {
     $.post("/search/index/fields/dynamic", {
     $.post("/search/index/fields/dynamic", {
         name: self.name()
         name: self.name()
       }, function (data) {
       }, function (data) {
-        data = JSON.bigdataParse(data);
         if (data.status == 0) {
         if (data.status == 0) {
           syncArray(self.template.fieldsAttributes, data.gridlayout_header_fields, true);
           syncArray(self.template.fieldsAttributes, data.gridlayout_header_fields, true);
           syncArray(self.fields, data.fields, true);
           syncArray(self.fields, data.fields, true);
         }
         }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {});
+    }).fail(function (xhr, textStatus, errorThrown) {});
   };
   };
 
 
   self.toggleSortColumnGridLayout = function (template_field) {
   self.toggleSortColumnGridLayout = function (template_field) {
@@ -1092,7 +1086,6 @@ var NewTemplate = function (vm, initial) {
         collection: ko.mapping.toJSON(vm.collection),
         collection: ko.mapping.toJSON(vm.collection),
         show_all: ko.mapping.toJSON(vm.showCores)
         show_all: ko.mapping.toJSON(vm.showCores)
       }, function (data) {
       }, function (data) {
-        data = JSON.bigdataParse(data);
         if (data.status == 0) {
         if (data.status == 0) {
           // Sync new and old names
           // Sync new and old names
           $.each(data.collection, function(index, name) {
           $.each(data.collection, function(index, name) {
@@ -1113,7 +1106,7 @@ var NewTemplate = function (vm, initial) {
         else {
         else {
           $(document).trigger("error", data.message);
           $(document).trigger("error", data.message);
         }
         }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     }).done(function() {
     }).done(function() {
       vm.isSyncingCollections(false);
       vm.isSyncingCollections(false);
@@ -1315,8 +1308,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
             facet: ko.mapping.toJSON(facet),
             facet: ko.mapping.toJSON(facet),
             qdata: ko.mapping.toJSON(qdata),
             qdata: ko.mapping.toJSON(qdata),
             multiQ: multiQ
             multiQ: multiQ
-          }, function (data) { return JSON.bigdataParse(data); },
-          "text");
+          }, function (data) {return data});
       });
       });
     }
     }
 
 
@@ -1335,7 +1327,6 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
         query: ko.mapping.toJSON(self.query),
         query: ko.mapping.toJSON(self.query),
         layout: ko.mapping.toJSON(self.columns)
         layout: ko.mapping.toJSON(self.columns)
       }, function (data) {
       }, function (data) {
-        data = JSON.bigdataParse(data);
 
 
         if (typeof callback != undefined && callback != null){
         if (typeof callback != undefined && callback != null){
           callback(data);
           callback(data);
@@ -1419,7 +1410,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
           }
           }
           self.resultsHash = _resultsHash;
           self.resultsHash = _resultsHash;
         }
         }
-      }, "text")
+      })
       ].concat(multiQs)
       ].concat(multiQs)
     )
     )
     .done(function() {
     .done(function() {
@@ -1492,7 +1483,6 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       collection: ko.mapping.toJSON(self.collection),
       collection: ko.mapping.toJSON(self.collection),
       id: doc.id
       id: doc.id
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
       var details = [];
       var details = [];
       doc.details.removeAll();
       doc.details.removeAll();
       if (data.status == 0) {
       if (data.status == 0) {
@@ -1522,7 +1512,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       }
       }
       doc.details(details);
       doc.details(details);
       doc.originalDetails(ko.toJSON(doc.details()));
       doc.originalDetails(ko.toJSON(doc.details()));
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     });
     });
   };
   };
@@ -1533,7 +1523,6 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       document: ko.mapping.toJSON(doc),
       document: ko.mapping.toJSON(doc),
       id: doc.id
       id: doc.id
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
       if (data.status == 0) {
       if (data.status == 0) {
         doc.showEdit(false);
         doc.showEdit(false);
         doc.originalDetails(ko.toJSON(doc.details()));
         doc.originalDetails(ko.toJSON(doc.details()));
@@ -1541,7 +1530,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       else {
       else {
         $(document).trigger("error", data.message);
         $(document).trigger("error", data.message);
       }
       }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     });
     });
   };
   };
@@ -1579,8 +1568,6 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       collection: ko.mapping.toJSON(self.collection),
       collection: ko.mapping.toJSON(self.collection),
       layout: ko.mapping.toJSON(self.columns)
       layout: ko.mapping.toJSON(self.columns)
     }, function (data) {
     }, function (data) {
-      data = JSON.bigdataParse(data);
-
       if (data.status == 0) {
       if (data.status == 0) {
         self.collection.id(data.id);
         self.collection.id(data.id);
         $(document).trigger("info", data.message);
         $(document).trigger("info", data.message);
@@ -1591,7 +1578,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       else {
       else {
         $(document).trigger("error", data.message);
         $(document).trigger("error", data.message);
       }
       }
-    }, "text").fail(function (xhr, textStatus, errorThrown) {
+    }).fail(function (xhr, textStatus, errorThrown) {
       $(document).trigger("error", xhr.responseText);
       $(document).trigger("error", xhr.responseText);
     });
     });
   };
   };

+ 0 - 1
apps/search/src/search/templates/search.mako

@@ -1871,7 +1871,6 @@ ${ dashboard.import_layout(True) }
 
 
 <script src="${ static('search/js/search.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('search/js/search.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('search/js/lzstring.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('search/js/lzstring.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/hue.json.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.textsqueezer.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.textsqueezer.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/ko.editable.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/ko.editable.js') }" type="text/javascript" charset="utf-8"></script>