Parse to int

[mkdru-moved-to-drupal.org.git] / mkdru.module

diff --git a/mkdru.module b/mkdru.module
index b1bde08..7ad7479 100644 (file)
--- a/mkdru.module
+++ b/mkdru.module
@@ -20,16 +20,17 @@ function mkdru_node_info() {
 function mkdru_ting_search_tab($keys) {
   error_log("TING SEARCH TAB invoked");
    $path = drupal_get_path('module', 'mkdru');
-  // Include client library.
-  // D6 seems not to be able to handle external scripts
-  // assume one if path starts with http:
-  // assume alias if path starts with /
-  if (preg_match('/^http:/') || preg_match('/^\//') {
-     drupal_add_js(variable_get('pz2_js_path', 'pazpar2/js') 
-      . '/pz2.js', 'module', 'footer', TRUE, TRUE, FALSE);  
+  // D6 is not to be able to handle external scripts and always
+  // prepends '/' (so we cannot keep pz2.js on remote host)
+  // we will try to be even smarter :)
+  $pz2_js_path = variable_get('pz2_js_path', 'pazpar2/js');
+  if (preg_match('/^\//', $pz2_js_path)) {
+     $pz2_js_path = trim($pz2_js_path, '/');
+     drupal_add_js($pz2_js_path.'/pz2.js', 'module', 'footer',
+       TRUE, TRUE, FALSE);
+     error_log("Pz2.js added as alias script '".$pz2_js_path);  
   } else {
-    drupal_add_js($path.'/'.variable_get('pz2_js_path', 'pazpar2/js') 
-      . '/pz2.js', 'module', 'footer');
+    drupal_add_js($path.'/'.$pz2_js_path.'/pz2.js', 'module', 'footer');
   }
   drupal_add_js($path . '/jquery.ba-bbq.js', 'module', 'footer');
   drupal_add_js($path . '/recipe.js', 'module', 'footer');