Adjustments for new person/id scheme

diff --git a/src/LinuxTag/2005/search.wml b/src/LinuxTag/2005/search.wml
index 47118b3..8d9404d 100644 (file)
--- a/src/LinuxTag/2005/search.wml
+++ b/src/LinuxTag/2005/search.wml
@@ -126,9 +126,10 @@ function search_workshop ($dbh, $key)
 {
   global $foundsomething;
 
-  $query = sprintf ("SELECT oid,title FROM workshop WHERE "
-                  ."title ~* '%s' OR speaker ~* '%s' OR abstract ~* '%s' OR comment ~* '%s' "
-                  ."ORDER BY title",
+  $query = sprintf ("SELECT oid,title FROM workshop,person WHERE "
+                   ."person = id AND "
+                  ."title ~* '%s' OR name ~* '%s' OR abstract ~* '%s' OR workshop.comment ~* '%s' "
+                  ."ORDER BY upper(title)",
                    $key, $key, $key, $key);
   $sth = pg_exec ($dbh, $query) or die("Datenbank-Abfrage!");