rebuilding head

diff --git a/lib/Tidy.jar b/lib/Tidy.jar
new file mode 100755 (executable)
index 0000000..eb56a45
Binary files /dev/null and b/lib/Tidy.jar differ

diff --git a/lib/cglib-full-2.0.2.jar b/lib/cglib-full-2.0.2.jar
new file mode 100755 (executable)
index 0000000..c35f0cf
Binary files /dev/null and b/lib/cglib-full-2.0.2.jar differ

diff --git a/lib/commons-collections-2.1.1.jar b/lib/commons-collections-2.1.1.jar
new file mode 100755 (executable)
index 0000000..3272f2b
Binary files /dev/null and b/lib/commons-collections-2.1.1.jar differ

diff --git a/lib/commons-dbcp-1.2.1.jar b/lib/commons-dbcp-1.2.1.jar
new file mode 100755 (executable)
index 0000000..08440c0
Binary files /dev/null and b/lib/commons-dbcp-1.2.1.jar differ

diff --git a/lib/commons-fileupload-1.0-beta-1.jar b/lib/commons-fileupload-1.0-beta-1.jar
deleted file mode 100755 (executable)
index ab99356..0000000
Binary files a/lib/commons-fileupload-1.0-beta-1.jar and /dev/null differ

diff --git a/lib/commons-fileupload-1.0.jar b/lib/commons-fileupload-1.0.jar
new file mode 100755 (executable)
index 0000000..1ca4a9c
Binary files /dev/null and b/lib/commons-fileupload-1.0.jar differ

diff --git a/lib/commons-httpclient-2.0.jar b/lib/commons-httpclient-2.0.jar
new file mode 100755 (executable)
index 0000000..f58ec95
Binary files /dev/null and b/lib/commons-httpclient-2.0.jar differ

diff --git a/lib/commons-lang-1.0.1.jar b/lib/commons-lang-1.0.1.jar
new file mode 100755 (executable)
index 0000000..37ddb9b
Binary files /dev/null and b/lib/commons-lang-1.0.1.jar differ

diff --git a/lib/commons-logging-1.0.4.jar b/lib/commons-logging-1.0.4.jar
new file mode 100755 (executable)
index 0000000..b73a80f
Binary files /dev/null and b/lib/commons-logging-1.0.4.jar differ

diff --git a/lib/commons-pool-1.2.jar b/lib/commons-pool-1.2.jar
new file mode 100755 (executable)
index 0000000..4ba534c
Binary files /dev/null and b/lib/commons-pool-1.2.jar differ

diff --git a/lib/dom4j-1.4.jar b/lib/dom4j-1.4.jar
new file mode 100755 (executable)
index 0000000..2a58756
Binary files /dev/null and b/lib/dom4j-1.4.jar differ

diff --git a/lib/ehcache-0.9.jar b/lib/ehcache-0.9.jar
new file mode 100755 (executable)
index 0000000..092c8e7
Binary files /dev/null and b/lib/ehcache-0.9.jar differ

diff --git a/lib/hibernate-2.1.6.jar b/lib/hibernate-2.1.6.jar
new file mode 100755 (executable)
index 0000000..a76861c
Binary files /dev/null and b/lib/hibernate-2.1.6.jar differ

diff --git a/lib/jta.jar b/lib/jta.jar
new file mode 100755 (executable)
index 0000000..e0822a9
Binary files /dev/null and b/lib/jta.jar differ

diff --git a/lib/odmg-3.0.jar b/lib/odmg-3.0.jar
new file mode 100755 (executable)
index 0000000..258b673
Binary files /dev/null and b/lib/odmg-3.0.jar differ

diff --git a/lib/poolman.jar b/lib/poolman.jar
deleted file mode 100755 (executable)
index d3de5b5..0000000
Binary files a/lib/poolman.jar and /dev/null differ

diff --git a/lib/postgresql-74jdbc2.jar b/lib/postgresql-74jdbc2.jar
new file mode 100755 (executable)
index 0000000..e7c2da7
Binary files /dev/null and b/lib/postgresql-74jdbc2.jar differ

diff --git a/lib/velocity-1.3.1.jar b/lib/velocity-1.3.1.jar
new file mode 100755 (executable)
index 0000000..6cb64ec
Binary files /dev/null and b/lib/velocity-1.3.1.jar differ

diff --git a/meta/web.xml b/meta/web.xml
new file mode 100755 (executable)
index 0000000..595c304
--- /dev/null
+++ b/meta/web.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+
+<web-app>
+    <servlet>
+        <servlet-name>
+            Mir
+        </servlet-name>
+        <servlet-class>
+            Mir
+        </servlet-class>
+
+        <init-param>
+            <param-name>Config</param-name>
+            <param-value>etc/config.properties</param-value>
+        </init-param>
+
+    </servlet>
+
+    <servlet>
+        <servlet-name>
+            OpenMir
+        </servlet-name>
+        <servlet-class>
+            OpenMir
+        </servlet-class>
+
+        <init-param>
+            <param-name>Config</param-name>
+            <param-value>etc/config.properties</param-value>
+        </init-param>
+
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>
+            Mir
+        </servlet-name>
+        <url-pattern>
+            /Mir
+        </url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>
+            Mir
+        </servlet-name>
+        <url-pattern>
+            /servlet/Mir
+        </url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>OpenMir</servlet-name>
+        <url-pattern>/OpenMir</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>OpenMir</servlet-name>
+        <url-pattern>/servlet/OpenMir</url-pattern>
+    </servlet-mapping>
+
+    <mime-mapping>
+      <extension>
+        mp3 
+      </extension>
+      <mime-type>
+        audio/x-mp3
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        ra
+      </extension>
+      <mime-type>
+        audio/vnd.rn-realaudio
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        rm
+      </extension>
+      <mime-type>
+        application/vnd.rn-realmedia
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        mov
+      </extension>
+      <mime-type>
+        video/quicktime 
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        mpg
+      </extension>
+      <mime-type>
+        video/mpeg
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        avi
+      </extension>
+      <mime-type>
+        video/x-msvideo
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        asf
+      </extension>
+      <mime-type>
+        video/x-ms-asf
+      </mime-type>
+    </mime-mapping>
+    <mime-mapping>
+      <extension>
+        pdf
+      </extension>
+      <mime-type>
+        application/pdf
+      </mime-type>
+    </mime-mapping>
+</web-app>

diff --git a/scripts/search.pl b/scripts/search.pl
deleted file mode 100755 (executable)
index 02f1ad1..0000000
--- a/scripts/search.pl
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/perl
-
-use CGI qw(:standard);
-use LWP::UserAgent;
-use URI::Escape;
-
-#this program takes, as CGI params, a query string "words"
-#a syntax string "bool" (and|or), values of Y or N for the 
-#variables of the form hasVideo, hasAudio, hasImage, etc.
-#and a variable topic corresponding to the desired topic title
-#it then munges these variables into an appropriate request to htdig,
-# does this request and forwards the results to the user 
-
-$searchhost='http://prod.indymedia.nl/cgi-bin/htsearch';
-
-$bool=param('bool');
-$hasVideo=param('hasVideo');
-$hasAudio=param('hasAudio');
-$hasImages=param('hasImages');
-$topic=param('topic');
-@topic_words=split(/\s+/,$topic);
-@words=();
-
-$querywords='';
-@words=split (/\s+/,param('words')) if param('words');
-push @words,@topic_words;
-if (@words){
-
-if ($bool eq "and"){
-$querywords=join " AND ", @words;  
-}
-else{
-$querywords=join " OR ", @words;  
-}
-
-$querywords =~ s/\(\)/ /g;
-$querywords="($querywords)";
-}
-
-if ($hasVideo eq "Y" || $hasAudio eq "Y" || $hasImages eq "Y"){
-    $first=1;
-    if (@words){
-    $querywords.=" AND ";
-}
-    $querywords .= "(";
-
-if ($hasVideo eq "Y"){
-    if (!$first){
-       $querywords.=" OR";
-    }
-    $querywords.=" RealVideo OR Video"; 
-    $first=0;
-} 
-
-if ($hasAudio eq "Y"){
-    if (!$first){
-       $querywords.=" OR";
-    }    
-    $querywords.=" RealAudio OR Audio"; 
-    $first=0;
-} 
-
-if ($hasImages eq "Y"){
-    if (!$first){
-       $querywords.=" OR";
-    }
-    $querywords.=" ImagesGif OR ImagesJpeg";
-    $first=0;
-}
-       $querywords.=" )";
-}
-
-$querywords=uri_escape($querywords,"^A-Za-z0-9");
-
-$query="words=$querywords&format=builtin-long&sort=score&method=boolean";
-
-# propagate the config parameter if it is set - rob
-$config=param('config');
-$query.="&config=$config" if $config;
-
-
-
-$ua = new LWP::UserAgent;
-$ua->agent("AgentName/0.1 " . $ua->agent);
-
-# Create a request
-my $req = new HTTP::Request POST => $searchhost;
-$req->content_type('application/x-www-form-urlencoded');
-$req->content($query);
-
-# Pass request to the user agent and get a response back
-my $res = $ua->request($req);
-
-# Check the outcome of the response
-if ($res->is_success) {
-    print header;
-    print $res->content;
-} else {
-    print header;
-    print "Search engine temporarily unavailable\n";
-}