@@ -1,4 +1,4 @@ -// $Id$ +// $Id: INSTALL.txt,v 1.4 2008/07/17 11:51:06 arto Exp $ NOTE: This is experimental software meant for advanced users; assume nothing works, and you may be pleasantly surprised. And when it breaks, you get to INSTALL.txt @@ -1,4 +1,4 @@ -// $Id$ +// $Id: README.txt,v 1.5 2008/07/24 13:16:13 arto Exp $ Exhibit for Drupal ================== README.txt @@ -1,4 +1,4 @@ -// $Id$ +// $Id: TODO.txt,v 1.3 2008/07/17 11:51:06 arto Exp $ This is a listing of known bugs, features that mostly work but are still somewhat in progress, features that are being considered or planned for TODO.txt @@ -1,2 +1,2 @@ <?php -// $Id$ +// $Id: exhibit_core.admin.inc,v 1.3 2008/07/17 11:51:07 arto Exp $ contrib/exhibit_core/exhibit_core.admin.inc @@ -1,7 +1,14 @@ -; $Id$ +; $Id: exhibit_core.info,v 1.3 2008/07/17 11:51:07 arto Exp $ name = Exhibit Drupal description = Provides Exhibit JSON data feeds of Drupal users, nodes and taxonomy terms. package = SIMILE dependencies[] = exhibit core = 6.x php = 5.2 + +; Information added by drupal.org packaging script on 2008-06-02 +version = "6.x-1.0-alpha1" +core = "6.x" +project = "exhibit" +datestamp = "1212404706" + contrib/exhibit_core/exhibit_core.info @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit_core.module,v 1.3 2008/07/17 11:51:07 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Core API hooks contrib/exhibit_core/exhibit_core.module @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit_core.pages.inc,v 1.4 2008/07/17 11:51:07 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Exhibit data feeds contrib/exhibit_core/exhibit_core.pages.inc @@ -1,4 +1,4 @@ -; $Id$ +; $Id: exhibit_sparql.info,v 1.2 2008/07/17 11:51:07 arto Exp $ name = Exhibit SPARQL description = Provides Exhibit JSON data feeds of SPARQL query results. package = SIMILE @@ -6,3 +6,10 @@ dependencies[] = exhibit dependencies[] = sparql core = 6.x php = 5.2 + +; Information added by drupal.org packaging script on 2008-06-02 +version = "6.x-1.0-alpha1" +core = "6.x" +project = "exhibit" +datestamp = "1212404706" + contrib/exhibit_sparql/exhibit_sparql.info @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit_sparql.module,v 1.2 2008/07/17 11:51:07 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Core API hooks contrib/exhibit_sparql/exhibit_sparql.module @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit.admin.inc,v 1.4 2008/07/24 13:16:13 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Exhibit API functions exhibit.admin.inc @@ -1,6 +1,13 @@ -; $Id$ +; $Id: exhibit.info,v 1.3 2008/07/17 11:51:06 arto Exp $ name = Exhibit description = Displays structured data in the form of rich visualizations that can be searched, filtered and sorted using faceted browsing. package = SIMILE core = 6.x php = 5.2 + +; Information added by drupal.org packaging script on 2008-06-02 +version = "6.x-1.0-alpha1" +core = "6.x" +project = "exhibit" +datestamp = "1212404706" + exhibit.info @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit.install,v 1.3 2008/07/17 11:51:06 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Core API hooks exhibit.install @@ -1,4 +1,4 @@ -// $Id$ +// $Id: exhibit.js,v 1.2 2008/07/24 13:16:13 arto Exp $ /** * Enable auto facet generation based on fields in selected feeds in Exhibit node creation exhibit.js @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit.module,v 1.5 2008/07/24 13:16:13 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Module settings @@ -303,6 +303,19 @@ function exhibit_view($node, $teaser = FALSE, $page = FALSE) { } ////////////////////////////////////////////////////////////////////////////// +// Views API hooks + +/** + * Implementation of hook_views_api(). + */ +function exhibit_views_api() { + return array( + 'api' => 2, + 'path' => drupal_get_path('module', 'exhibit'), + ); +} + +////////////////////////////////////////////////////////////////////////////// // Exhibit API hooks /** @@ -356,32 +369,15 @@ function exhibit_get_url($url) { if (exhibit_is_link_internal($url)) { $url_parts = parse_url($url); // Handle views args - if (isset($_GET['args']) && is_numeric($_GET['args'])) { - // Tack on to existing query if it exists - if ($url_parts['query']) { - $query_parts = explode('&', $url_parts['query']); - // Check for 'args' in query already - foreach ($query_parts as $idx => $part) { - if (preg_match('/^args/', $part)) { - $arg_exists = TRUE; - $query_parts[$idx] .= ','. $_GET['args']; - } - } - if (!$arg_exists) { - // 'args' wasn't found in query, so add it - $url_parts['query'] .= '&args='. $_GET['args']; - } - else { - // 'args' was updated, so join the parts back together - $url_parts['query'] = implode('&', $query_parts); - } - } - else { - // No query params portion of the url, so add it - $url_parts['query'] = 'args='. $_GET['args']; - } + if (isset($_GET['args'])) { + $url_parts['path'] = preg_replace('/\/$/', '', $url_parts['path']) . '/' . $_GET['args']; + } + if (empty($url_parts['query'])) { + return url($url_parts['path']); + } + else { + return url($url_parts['path'], array('query' => $url_parts['query'])); } - return url($url_parts['path'], array('query' => $url_parts['query'])); } else { return url($url, array('external' => TRUE)); exhibit.module @@ -1,5 +1,5 @@ <?php -// $Id$ +// $Id: exhibit.pages.inc,v 1.2 2008/07/17 11:51:06 arto Exp $ ////////////////////////////////////////////////////////////////////////////// // Menu callbacks exhibit.pages.inc contrib/exhibit_views/exhibit_views.info contrib/exhibit_views/exhibit_views.module 235bf29ddbda1afd8399083f1f8356eb7fb64333 Josh Huckabee joshhuckabee@gmail.com http://github.com/jhuckabee/drupal-exhibit/commit/b5064d9bb92d771bb085c127a35b52791237620f b5064d9bb92d771bb085c127a35b52791237620f 2008-12-11T10:11:32-08:00 2008-12-11T10:11:32-08:00 Replaced exhibit_views module with natural Views2 integration bae17fb7958e7e8792878453e6e77008e2fc7528 Josh Huckabee joshhuckabee@gmail.com