Changeset 57418

Timestamp:

04/07/08 16:40:13 (5 months ago)

Author:

ischommer

Message:

adapted to DataFormatter? and RestfulServer? API changes

Location:

modules/marketdemandmap/trunk

Files:

• code/controller/DemandPointRestfulServer.php (modified) (4 diffs)
• javascript/demandmap.DemandCategoryControl.js (modified) (1 diff)
• javascript/demandmap.DemandPointList.js (modified) (4 diffs)

modules/marketdemandmap/trunk/code/controller/DemandPointRestfulServer.php

@@ -11 +11 @@
         }
         
-        protected function search($className, $params = null, $sort = null, $limit = null, $existingQuery = null) {
-                
-                if(singleton($className)->hasMethod('getRestfulSearchContext')) {
-                        $searchContext = singleton($className)->{'getRestfulSearchContext'}();
-                } else {
-                        $searchContext = singleton($className)->getDefaultSearchContext();
-                }
-
-                if(isset($params['clustered']) && $params['clustered']) {
-                        // we need bounds to cluster onto, otherwise its kinda pointless
-                        if(!isset($params['Bounds']) || !singleton('LatLngBoundsFilter')->isValid($params['Bounds'])) return false;
-                        // don't apply limit clause, we'll do this later in clustering
-                        $query = $searchContext->getQuery($params, $sort, null, $existingQuery);
-                        
-                        return $this->cluster($query, $params['Bounds']);
-                } else {
-                        $query = $searchContext->getQuery($params, $sort, $limit, $existingQuery);
-                        if(
-                                (isset($limit['limit']) && $limit['limit'] > DemandPoint::$default_cluster_markercount)
-                                || (!isset($limit['limit']) && $query->unlimitedRowCount() > DemandPoint::$default_cluster_markercount)
-                                && isset($params['Bounds'])
-                        ) {
-                                $query = $searchContext->getQuery($params, $sort, null, $existingQuery);
-                                return $this->cluster($query, $params['Bounds']);
-                        } else {
-                                return singleton($className)->buildDataObjectSet($query->execute());
-                        }
-                }
+        protected function needsCluster($query, $params, $sort, $limit) {
+                return (
+                        (isset($limit['limit']) && $limit['limit'] > DemandPoint::$default_cluster_markercount)
+                        || (!isset($limit['limit']) && $query->unlimitedRowCount() > DemandPoint::$default_cluster_markercount)
+                        && isset($params['Bounds'])
+                );
         }
         
@@ -204 +182 @@
         }
         
-        /**
-         * HACK to set custom fields if clustering is necessary
-         * as we're requiring different fields outside of the normal $db
-         * array - and can't anticipate in the RESTful request
-         * if those cluster fields are needed.
-         * 
-         * @todo Need a way to determine custom fields on a by-result and by-class basis.
-         */
-        protected function getHandler($className, $id, $relation) {
+        protected function getHandler($className, $id, $relationName) {
                 $sort = array(
                         'sort' => $this->request->getVar('sort'),
@@ -222 +192 @@
                 );
                 
+                $params = $this->request->getVars();
+                
                 $responseFormatter = $this->getResponseDataFormatter();
                 if(!$responseFormatter) return $this->unsupportedMediaType();
                 
+                // $obj can be either a DataObject or a DataObjectSet,
+                // depending on the request
                 if($id) {
-                        $obj = DataObject::get_by_id($className, $id);
+                        // Format: /api/v1/<MyClass>/<ID>
+                        $query = $this->getObjectQuery($className, $id, $params);
+                        $obj = singleton($className)->buildDataObjectSet($query->execute());
                         if(!$obj) return $this->notFound();
+                        $obj = $obj->First();
                         if(!$obj->canView()) return $this->permissionFailure();
-                        
-                        if($relation) {
-                                if($relationClass = $obj->many_many($relation)) {
-                                        $query = $obj->getManyManyComponentsQuery($relation);
-                                } elseif($relationClass = $obj->has_many($relation)) {
-                                        $query = $obj->getComponentsQuery($relation);
-                                } elseif($relationClass = $obj->has_one($relation)) {
-                                        $query = null;
-                                } elseif($obj->hasMethod("{$relation}Query")) {
-                                        // @todo HACK Switch to ComponentSet->getQuery() once we implement it (and lazy loading)
-                                        $query = $obj->{"{$relation}Query"}(null, $sort, null, $limit);
-                                        $relationClass = $obj->{"{$relation}Class"}();
+
+                        // Format: /api/v1/<MyClass>/<ID>/<Relation>
+                        if($relationName) {
+                                $query = $this->getObjectRelationQuery($obj, $params, $sort, $limit, $relationName);
+                                if($query === false) return $this->notFound();
+                                if($this->needsCluster($query, $params, $sort, $limit)) {
+                                        $obj = $this->cluster($query, $params['Bounds']);
                                 } else {
-                                        return $this->notFound();
+                                        $searchQuery = $this->getSearchQuery($className, $params, $sort, $limit);
+                                        $obj = singleton($className)->buildDataObjectSet($searchQuery->execute());
                                 }
-                                
-                                // get all results
-                                $obj = $this->search($relationClass, $this->request->getVars(), $sort, $limit, $query);
-                                if(!$obj) $obj = new DataObjectSet();
-                        }
+                        } 
+                        
                 } else {
-                        $obj = $this->search($className, $this->request->getVars(), $sort, $limit);
+                        // Format: /api/v1/<MyClass>
+                        $query = $this->getObjectsQuery($className, $params, $sort, $limit);
+                        if($this->needsCluster($query, $params, $sort, $limit)) {
+                                $obj = $this->cluster($query, $params['Bounds']);
+                        } else {
+                                $searchQuery = $this->getSearchQuery($className, $params, $sort, $limit);
+                                $obj = singleton($className)->buildDataObjectSet($searchQuery->execute());
+                        }
+
                         // show empty serialized result when no records are present
                         if(!$obj) $obj = new DataObjectSet();
+                }
+                
+                $this->getResponse()->addHeader('Content-Type', $responseFormatter->getOutputContentType());
+
+                if($obj instanceof DataObjectSet) {
+                        $responseFormatter->setTotalSize($query->unlimitedRowCount());
                         
                         // HACK Customization (see method comment)
@@ -264 +248 @@
                                 )); 
                         }
-                }
-                
-                $this->getResponse()->addHeader('Content-Type', $responseFormatter->getOutputContentType());
-                
-                if($obj instanceof DataObjectSet) return $responseFormatter->convertDataObjectSet($obj);
-                else return $responseFormatter->convertDataObject($obj);
-        }
-        
+                        
+                        return $responseFormatter->convertDataObjectSet($obj);
+                } else {
+                        return $responseFormatter->convertDataObject($obj);
+                }
+        }
+                        
         protected function getResponseDataFormatter() {
                 $responseFormatter = $this->getDataFormatter(true);

modules/marketdemandmap/trunk/javascript/demandmap.DemandCategoryControl.js

@@ -83 +83 @@
                                                         _setLoading(false, i);
                                                 });
-                                                $map.fn('addPoints', markersJson);
+                                                $map.fn('addPoints', markersJson.items);
                                                 
-                                                $this.trigger('DemandCategoryControl:loadcategories', [categoryIDs, markersJson]);
+                                                $this.trigger('DemandCategoryControl:loadcategories', [categoryIDs, markersJson.items]);
                                         }
                                 );

modules/marketdemandmap/trunk/javascript/demandmap.DemandPointList.js

@@ -16 +16 @@
                 // config
                 var defaults = {
-                        
+                        'pageSize': 20
                 };
                 
@@ -55 +55 @@
                         // ######## public methods #########
                         $this.fn({
-                                'refresh' : function(force) {
+                                'refresh' : function(force, url) {
                                         if(!$this.is(':visible') && !force) return false;
                                         
-                                        var url = demandControl.fn('getDataURL');
+                                        if(!url) url = demandControl.fn('getDataURL');
 
                                         // don't set this above the cluster threshold,
                                         // or the clustering will kick in
-                                        url += '&limit=40';
+                                        url += '&limit=' + options.pageSize;
 
                                         $.getJSON(
@@ -89 +89 @@
                                 // body definition
                                 html += '<tbody>';
-                                for(var i=0; i<markers.length; i++) {
-                                        var m = markers[i];
-console.debug(markers[i]);
+                                for(var i=0; i<markers.items.length; i++) {
+                                        var m = markers.items[i];
                                         html += 
                                                 '<tr class="vcard">'
@@ -115 +114 @@
                                 html += '</table>';
                                 
+                                // pagination
+                                html += '<ul class="pagination">';
+                                html += '<li>';
+                                html += '<a href="#"></a>';
+                                html += '</li>';
+                                html += '</ul>';
+                                
                                 // insert html
                                 $this.html(html);