--- trunk/make_config.pl	2003/05/04 01:31:31	33
+++ trunk/make_config.pl	2004/01/26 08:08:41	59
@@ -6,13 +6,18 @@
 #
 
 use strict;
+use Getopt::Long;
+
+my $stripurl;
+
+my $result = GetOptions ("stripurl=s" => \$stripurl);
 
 my $name = shift @ARGV;
 my $url = shift @ARGV;
-my $stripurl = shift @ARGV;
+my $title = join(" ",@ARGV);
 
 if (!$name || !$url) {
-	print "Usage: $0 name URL [strip from url]\n";
+	print "Usage: $0 [--stripurl=path] name URL title\n";
 	exit;
 }
 
@@ -27,10 +32,10 @@
 
 if ($url =~ m#(http://[^/]+)(/.*)$#) {
 	($host,$urlpath) = ($1,$2);
-	if ($stripurl && $urlpath =~ m/^(.*$stripurl)/) {
+	if ($stripurl && $url =~ m/^(.*$stripurl)/) {
 		$stripurl = $1;
 	} else {
-		$stripurl = "";
+		$stripurl = $host;
 	}
 } else {
 	print "Can't parse URL $url into host and path!\n";
@@ -41,6 +46,7 @@
 $baseurl =~ s#/[^/]+$#/#g;
 
 print "Config name: $name\nCrawling url: $url [strip $stripurl]\n";
+print "Title: $title\n" if ($title);
 
 
 my $config = <<"EOF";
@@ -49,9 +55,9 @@
 IncludeConfigFile $dir/common.config
 
 # this is a cludge to implement no parent URL feature in swish indexer
-IndexDir "$url $baseurl"
-ReplaceRules replace " $baseurl" ""
-ReplaceRules replace "${host}${stripurl}" ""
+IndexDir "$baseurl $url"
+ReplaceRules replace "$baseurl " ""
+ReplaceRules replace "${stripurl}" ""
 
 IndexFile $dir/index/$name
 
@@ -67,18 +73,32 @@
 
 my $xml = << "EOF";
 <config
-	max_hits="1000"
+	max_hits="10"
 	prog="/usr/bin/swish-e"
 	index="$dir/index/$name"
 	charset="iso-8859-2"
-	title="$name search"
 	affix="/usr/lib/ispell/american.aff"
-	url="$stripurl"
+EOF
+if ($title) {
+	$xml .= "\ttitle=\"$title\"\n";
+} else {
+	$xml .= "\ttitle=\"$name search\"\n";
+}
+
+my $xml_title = $title || $url;
+
+my $xml_url = $url;
+$xml_url =~ s/^$host//;
+my $xml_urlprefix = $stripurl;
+$xml_urlprefix =~ s/^$host//;
+
+$xml .= "\turl=\"$xml_urlprefix\"\n" if ($stripurl);
+$xml .= << "EOF";
 	>
 	<labels>
 		<label value="10"> 10</label>
+		<label value="50"> 100</label>
 		<label value="100"> 100</label>
-		<label value="0">unlimited</label>
 	</labels>
 	<text>
 		<search>Search for </search>
@@ -88,7 +108,15 @@
 		<no_properties>don't display results details</no_properties>
 		<hits>Showing %s documents (of maximum %d)... (%s)</hits>
 		<no_hits>Can't find any documents (%s, %s)</no_hits>
-		<footer>Searcher will try to create different variations of words using spelling dictionary. If you enter a word with minus (-) before it, it will exclude documents with this word and plus (+) will do the opposite (e.g. -work +play)</footer>
+		<footer><![CDATA[
+		Searcher will try to create different variations of words
+		using spelling dictionary. If you enter a word with minus
+		(<tt>-</tt>) before it, it will exclude documents with this
+		word and plus (<tt>+</tt>) will do the opposite
+		(e.g. <tt>-work +play</tt>)
+		<p><small>Content indexed:
+		<a href="$xml_url">$xml_title</small></p>
+		]]></footer>
 	</text>
 	<!-- additional data to show summary -->
 	<properties>swishdescription swishdocsize</properties>
@@ -99,8 +127,8 @@
 </config>
 EOF
 
-print "Creating $dir/$name.config\n";
-open(C,"> $dir/$name.config") || die "can't open $dir/$name.config: $!";
+print "Creating $dir/config/$name\n";
+open(C,"> $dir/config/$name") || die "can't open $dir/config/$name: $!";
 print C $config;
 close(C);
 
@@ -112,5 +140,5 @@
 print "Creating symlink to $dir/html/$name.cgi\n";
 symlink "$dir/html/swish.cgi","$dir/html/$name.cgi" || die "can't create symlink $dir/html/$name.cgi: $!";
 
-#print "Index this with:\nswish-e -S http -c $dir/$name.config\n";
+#print "Index this with:\nswish-e -S http -c $dir/config/$name\n";
 #print "Search using $name.cgi\n";