--- no_pager/index.cgi	2006/08/16 23:37:51	18
+++ no_pager/index.cgi	2006/08/17 19:18:26	23
@@ -25,7 +25,12 @@
 
 my $json;
 
-#warn "config = ", dump($config);
+sub debug {
+	my ($text,$var) = @_;
+	print "<pre>$text = ", dump($var), "</pre>";
+}
+
+#debug('config', $config);
 
 sub json {
 	return
@@ -34,12 +39,27 @@
 	'</textarea>';
 }
 
+sub sort_order {
+	my $out;
+
+	my $sort = $q->param('sort');
+
+	$out .= '<select name="sort" id="sort">';
+
+	foreach my $s (@{ $config->{estraier}->{order} }) {
+		my ($text,$value) = %{$s};
+		$out .= qq{<option value="$value"} . 
+			( $sort eq $value ? ' selected' : '' ) .
+			qq{>$text</option>};
+	}
+
+	$out .= '</select>';
+}
+
 sub get_results {
 	my $p = {@_};
 
-	my ($search,$page) = ( $p->{search} || '', $p->{page} || 0);
-
-	warn "get_results( $search , $page )\n";
+	my ($search,$page) = ( $p->{search} , $p->{page});
 
 	sub next_page {
 		return '<div id="next_page">' .
@@ -70,6 +90,7 @@
 	$cond->set_phrase( $search );
 	$cond->set_max( $on_page );
 	$cond->set_skip( $skip );
+	$cond->set_order( $p->{sort} ) if ($p->{sort});
 
 	my $nres = $node->search($cond, ( $config->{estraier}->{depth} || 0 ) );
 
@@ -115,20 +136,26 @@
 			return $text;
 		}
 
+		my @template;
+		open(my $t, 'result.html')  || die "result.html: $!";
+		while(<$t>) {
+			push @template, $_;
+		}
+		close($t);
+
 		# for each document in results
 		for my $i ( 0 ... $nres->doc_num - 1 ) {
 
 			my $rdoc = $nres->get_doc($i);
-
-			$out .= '<div class="item">' .
-				'<h1>' . $rdoc->attr('@title') . '</h1>' .
-				'<p>' . html_snippet( $rdoc->snippet ) . '</p>' .
-				'<h2>' . attr_regex( $rdoc, 'source' ) . '</h2>';
 			my $uri = attr_regex( $rdoc, '@uri' );
-			$out .=
-				qq{<a href="$uri"><tt>$uri</tt></a> } .
-				attr_regex( $rdoc, '@mdate' ) .
-				' [' . ( $skip + $i + 1 ) . ']';
+			my $nr = $skip + $i + 1;
+
+			map {
+				my $l = $_;
+				$l =~ s/<%(.+?)%>/eval "$1"/ge;
+				$out .= $l;
+			} @template;
+
 		}
 
 	} else {
@@ -136,10 +163,10 @@
 	}
 
 	if ($v->{page} == $v->{max_page}) {
-		$out .= next_page('<strong>All results shown</strong>');
+		$out .= next_page('<br/><strong>All results shown</strong>');
 	} else {
 		$out .= next_page(
-			'<strong>Loading results...</strong><br/>',
+			'<br/><strong>Loading results...</strong><br/>',
 			'If you are using the scroll bar, release the mouse to see more results.'
 		);
 	}
@@ -151,16 +178,18 @@
 if ($q->path_info() eq '/snippet') {
 
 	print get_results(
-		search => $q->param('search'),
-		page => $q->param('page'),
+		search => $q->param('search') || '',
+		page => $q->param('page') || 0,
+		sort => $q->param('sort') || undef,
 	);
 
 
 } else {
 
 	my $get_results = get_results(
-		search => $q->param('search'),
+		search => $q->param('search') || '',
 		page => 1,
+		sort => $q->param('sort') || undef,
 	);
 
 	my $f = $q->path_info;
@@ -172,6 +201,6 @@
 		s/<%(.+?)%>/eval "$1"/ge;
 		print;
 	}
-	close($f);
+	close($s);
 
 }