Changeset 6137

Timestamp:

06/02/07 20:49:10 (1 year ago)

Author:

tarjei

Message:

fix #32 Create a new indexer backend for solr.

Files:

• trunk/midcom/midcom.core/midcom/services/indexer.php (modified) (4 diffs)
• trunk/midcom/midcom.core/midcom/services/indexer/backend/solr.php (added)
• trunk/midcom/midcom.core/midcom/services/indexer/document.php (modified) (1 diff)
• trunk/midcom/midcom.helper.search/config/manifest.inc (modified) (3 diffs)
• trunk/midcom/midcom.helper.search/style/advanced_form.php (modified) (1 diff)
• trunk/midcom/midcom.helper.search/style/search_form.php (modified) (1 diff)
• trunk/midcom/midcom.helper.search/viewer.php (modified) (6 diffs)

trunk/midcom/midcom.core/midcom/services/indexer.php

@@ -232 +232 @@
-            return true;
-        }
-
-        return $this->_backend->delete_all();
-    }
@@ -245 +244 @@
-     * The query syntax is also dependant on the backend. Refer to its documentation
-     * how queries should be built.
-     *
-     * Each result node is looked up in NAP/Metadata to verify its visibility.
-     *
-     * @param string $query The query, which must suite the backends query syntax. It is assumed to be in the site charset.
@@ -293 +290 @@
-            }
-
+            // this checks acls!
-            if ($document->is_a('midcom'))
-            {
@@ -304 +302 @@
-                }
-            }
-
-            // For all midcom doucments, check the metadata visibility state given by the source object.
-            // Do this only if MidCOM is configured to do so
-            if (   $document->is_a('midcom')
-                && (   $midcom_config['show_hidden_objects']
-                    || $midcom_config['show_unapproved_objects']))
-            {
-                $metadata =& midcom_helper_metadata::retrieve($document->source);
-
-                if (   $metadata
-                    && ! $metadata->is_object_visible_onsite())
-                {
-                    debug_add("Skipping the document {$document->title}, the metadata of the source document {$document->source} indicate no visibility.");
-                    continue;
-                }
-
-                // Drop the reference again.
-                unset($metadata);
-            }
-
-            // Check for additional security checks by the component or a custom callback
-            $component_loader =& $_MIDCOM->get_component_loader();
-            $security = explode(':', $document->security, 2);
-            switch ($security[0])
-            {
-                case 'component':
-                    // Component security, get the interface base class, if it exists, and
-                    // execute the corresponding handler.
-                    debug_add('Doing additional component-level security check');
-                    $interface =& $component_loader->get_interface_class($document->component);
-                    if (   $interface
-                        && $topic
-                        && ! $interface->check_document_permissions($document, $topic))
-                    {
-                        debug_add('Skipping the document, the callee returned false.');
-                        continue 2;
-                    }
-                    break;
-
-                case 'function':
-                    // Execute a custom callback to ascertain visbility.
-                    debug_add("We are in function security mode, executing the callback {$security[1]}.");
-                    if (! $security[1]($document, $topic))
-                    {
-                        debug_add('Skipping the document, the callee returned false.');
-                        continue 2;
-                    }
-                    break;
-
-                case 'class':
-                    die ('The class security callback is disabled, it is broken from the beginning.');
-                    // TODO: Fix this.
-
-                    // Execute a custom callback to ascertain visbility.
-                    debug_add("We are in function security mode, executing the callback {$security[1]}.");
-                    $class = $security[1];
-                    $instance =& $class->get_instance();
-                    if (! $instance->check_document_permissions($document, $topic))
-                    {
-                        debug_add('Skipping the document, the callee returned false.');
-                        continue 2;
-                    }
-                    break;
-            }
-
-            $result[] = $document;
-        }

trunk/midcom/midcom.core/midcom/services/indexer/document.php

@@ -347 +347 @@
-    {
-        // This is always UTF-8 conformant.
-
+Z
-    }
-

trunk/midcom/midcom.helper.search/config/manifest.inc

@@ -1 @@
-
-  'name' => 'midcom.helper.search',
-3
+4
-  'state' => 'beta',
-  'purecode' => false,
@@ -23 +22 @@
-        'active' => 'no',
-      ),
+      'tarjei' => 
+      array (
+        'name' => 'Tarjei Huse',
+        'email' => 'tarjei@nu.no',
+        'role' => 'lead',
+        'active' => 'yes',
+      ),
+ 
-    ),
-    'dependencies' => 
@@ -29 +36 @@
-      array (
-      ),
+      'http_request' =>
+         array (
+            'channel' => 'pear.php.net',
+        ),
-    ),
-  ),

trunk/midcom/midcom.helper.search/style/advanced_form.php

@@ -1 +1 @@
-<?php
-//
+
-$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
-

trunk/midcom/midcom.helper.search/style/search_form.php

@@ -1 @@
-<?php
-//$data =& $_MIDCOM->get_custom_context_data('request_data');
-?>
-<h1><?php echo $data['topic']->extra;?></h1>
-

trunk/midcom/midcom.helper.search/viewer.php

@@ -58 +58 @@
-            case 'advanced':
-                $data['query'] = (array_key_exists('query', $_REQUEST) ? $_REQUEST['query'] : '');
-
+//
-                $data['component'] = (array_key_exists('component', $_REQUEST) ? $_REQUEST['component'] : '');
-                $data['lastmodified'] = (array_key_exists('lastmodified', $_REQUEST) ? ((integer) $_REQUEST['lastmodified']) : 0);
@@ -105 +105 @@
-                                if (   count(explode(' ', $data['query'])) == 1
-                                    && !strstr($data['query'], '*'))
+                                {
+                                    // Single search term, append *
+                    if ($GLOBALS['midcom_config']['indexer_backend'] != 'solr') 
+                    {
+                                        $data['query'] .= '*';
+                    }
+                                }
+                                
+                                $result = $indexer->query($data['query']);
+                break;
+            
+            case 'advanced':
+                $data['query'] = trim($_REQUEST['query']);
+                
+                                if (   count(explode(' ', $data['query'])) == 1
+                                    && !strstr($data['query'], '*') && $GLOBALS['midcom_config']['indexer_backend'] != 'solr' )
-                                {
-                                    // Single search term, append *
@@ -110 +126 @@
-                                }
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                $data['component'] = trim($_REQUEST['component']);
-                $data['lastmodified'] = (integer) trim($_REQUEST['lastmodified']);
@@ -136 +138 @@
-                }
-                
-
-
-
+ 
+
+( $GLOBALS['midcom_config']['indexer_backend'] == 'solr' ) ? $data['query'] : 
-                }
-                else
@@ -145 +147 @@
-                }
-                
-
+request_
-                {
-                    if ($final_query != '')
@@ -151 +153 @@
-                        $final_query .= ' AND ';
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                if ($data['component'] != '')
-                {