Final touches for 0.4.0 release

Makefile

@@ -45,8 +45,6 @@ dist:
 		COPYING Makefile\
 	 INSTALL MANUAL README p.png RELEASENOTES *.lab yfklog-$(VERSION)
 	cp clubs/README yfklog-$(VERSION)/clubs
-	cp clubs/hscmember.txt yfklog-$(VERSION)/clubs
-	cp clubs/hsc2sql.awk yfklog-$(VERSION)/clubs
 	cp onlinelog/README yfklog-$(VERSION)/onlinelog
 	cp onlinelog/search.php yfklog-$(VERSION)/onlinelog
 	cp onlinelog/test.txt yfklog-$(VERSION)/onlinelog

README

@@ -1,10 +1,10 @@
-YFKlog Version 0.3.6 - A general purpose Ham Radio Logbook  
+YFKlog Version 0.4.0 - A general purpose Ham Radio Logbook  
 ------------------------------------------------------------------------------
 
 1. Project Description 
 ----------------------
 YFKlog is a general purpose logbook to keep track of amateur
-radio contacts. This is Version 0.3.6, released on 23. October 2007.
+radio contacts. This is Version 0.4.0, released on 23. October 2007.
 The key characteristics are:
 
 - Console based, bloat-free text interface. 

clubs/README

@@ -1,4 +1 @@
-This is still all chaotic, sorry :-)
-If you like to add other clubs or awards, have a look at the sources to figure
-out how to do it, or drop me a line. If it's a rather popular award, I will add
-it.
+Under construction.

clubs/agcw2sql.awk

@@ -1,12 +0,0 @@
-# Unfortunately the AGCW membership data is only available as a Excel
-# spreadsheet. It needs to be converted to a CSV list.
-
-BEGIN {
-		print "use DJ1YFK;"
-}
-
-// {
-	split($0,array,";")			# split the line up
-	print "INSERT INTO clubs (CLUB, CALL, NR) VALUES ('AGCW', '"array[2]"', '"array[1]"');"
-}	
-

clubs/hsc2sql.awk

@@ -1,36 +0,0 @@
-# http://www.qsl.net/dl0hsc/files/hscmember.zip
-#
-# The HSC membership data is given in the following format:
-
-# Call         HSC      Name                 2nd Call          ex Calls               Remarks
-# -------------------------------------------------------------------------------------------------------
-# 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-#           1         2         3         4         5         6         7         8
-#
-# What we need is only "Call", "HSC" (number) and "ex Calls" (2nd calls are
-# included in the normal list already as multiple entries)
-
-BEGIN {
-		print "use DJ1YFK;"
-}
-
-/^[0-9A-Z]*[0-9]+/ {			# Line starts with a number or letter, 
-								# then another number.. has to be a call
-	# The first two are always a callsign/number 
-	# combination and can be added to the DB.
-
-	print "INSERT INTO clubs (CLUB, CALL, NR) VALUES ('HSC', '"$1"', '"$2"');"
-		
-	# Now of the remaining line, we are only interested in 60 .. 83 (ex Calls)
-	# we save the part in question in "line", omitting the last character
-	# (newline).
-	line = substr($0, 60, length($0)-60);
-	gsub(/(\s|,)+/," ", line);			# remove all whitespaces and commas
-	if (length(line) > 1) {				# we have a ex Call
-		split(line, array, " ");		# split line into array
-		for (foo in array) {			# for every callsign
-			# print the callsign and the number...
-			print "INSERT INTO clubs (CLUB, CALL,NR) VALUES ('HSC', '"array[foo]"', '"$2"');"
-		}
-	}
-}

doc/index.html

@@ -89,13 +89,16 @@ and functions of YFKlog.</p>
     <li>SQLite</li>
     <li>ncurses</li>
     <li>Make</li>
+    <li>libwww-perl</li>
 </ul>
 
 <p>On Ubuntu or Debian Linux, you can satisfy all requirements simply by
 running:</p>
 <code>sudo apt-get install perl libdbd-sqlite3-perl libclass-dbi-sqlite-perl
-    make 
-    libsqlite3-0 libcurses-perl</code>
+    make libsqlite3-0 libcurses-perl libwww-perl</code>
+
+<p>For LoTW, you will also need the packages <pre>trustedqsl</pre> and
+<pre>xvfb</pre>.</p>
 
 <p>Download the <a href="http://fkurz.net/ham/yfklog/">latest version</a> of
 YFKlog and unpack the tarball to a directory of your choice, then run 
@@ -107,6 +110,7 @@ $ cd yfklog-0.4.0
 $ su
 # make install
 </pre></code>
+
 <p>By default, YFKlog will be installed to <code>/usr</code>, but you can specify
 another directory by adding the option
 <code>DESTDIR=/your/favorite/directory</code>. If you have no root privileges on

onlinelog/README

@@ -1,3 +1,8 @@
 Just a quick example how to use the $callsign.log to make a searchable online
-log. Of course it's also possible to directly use the MySQL database for the
-online log, etc...
+log. 
+
+Of course it's also possible (and probably a much better idea!) to
+directly use the MySQL database for the online log, etc.
+
+Example (live): https://fkurz.net/ham/log/ (link to source code on that page)
+

onlinelog/search.php

@@ -26,7 +26,7 @@ $callsign = strtoupper($callsign);
 <?php 
 $qsos = file("test.txt");
 foreach ($qsos as $qso) {
-	if (ereg($callsign, $qso)) {				# line contains the call
+	if (preg_match("/$callsign/", $qso)) {				# line contains the call
 		echo "<tr>";
 		$data = explode('~', $qso);				# put stuff in $data
 		foreach ($data as $foo) {				# every data..