- crux-commits - lists.crux.nu

r1721 - crux-2.2/ports/core/libstdc++-compat
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:44:52 +0200 (Mon, 14 Aug 2006) New Revision: 1721 Modified: crux-2.2/ports/core/libstdc++-compat/Pkgfile Log: libstdc++-compat: fix download url Modified: crux-2.2/ports/core/libstdc++-compat/Pkgfile =================================================================== --- crux-2.2/ports/core/libstdc++-compat/Pkgfile 2006-08-14 08:41:48 UTC (rev 1720) +++ crux-2.2/ports/core/libstdc++-compat/Pkgfile 2006-08-14 08:44:52 UTC (rev 1721) @@ -5,9 +5,9 @@ name=libstdc++-compat version=3.1 release=1 -source=(http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++-2-libc6.1-1-2.9.0.so \ - http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++-3-libc6.2-2-2.10… \ - http://www.fukt.bth.se/~per/crux/files/libstdc++/libstdc++.so.5.0.6) +source=(http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++-2-libc6.1-1-2.9.0.so \ + http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++-3-libc6.2-2-2.… \ + http://www.fukt.bsnet.se/~per/crux/files/libstdc++/libstdc++.so.5.0.6) build() { mkdir -p $PKG/usr/lib

1 0

r1720 - crux-2.2/ports/core/pkgutils
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:41:48 +0200 (Mon, 14 Aug 2006) New Revision: 1720 Modified: crux-2.2/ports/core/pkgutils/Pkgfile Log: pkgutils: fix url also in comment Modified: crux-2.2/ports/core/pkgutils/Pkgfile =================================================================== --- crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:40:19 UTC (rev 1719) +++ crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:41:48 UTC (rev 1720) @@ -1,5 +1,5 @@ # Description: A set of utilities to manage software packages -# URL: http://www.fukt.bth.se/~per/pkgutils/ +# URL: http://www.fukt.bsnet.se/~per/pkgutils/ # Maintainer: Per Lid�n, core-ports at crux dot nu name=pkgutils

1 0

r1719 - crux-2.2/ports/core/ports
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:40:19 +0200 (Mon, 14 Aug 2006) New Revision: 1719 Modified: crux-2.2/ports/core/ports/Pkgfile Log: ports: fix download url Modified: crux-2.2/ports/core/ports/Pkgfile =================================================================== --- crux-2.2/ports/core/ports/Pkgfile 2006-08-14 08:39:20 UTC (rev 1718) +++ crux-2.2/ports/core/ports/Pkgfile 2006-08-14 08:40:19 UTC (rev 1719) @@ -5,7 +5,7 @@ name=ports version=1.5 release=3 -source=(http://www.fukt.bth.se/~per/crux/files/ports/$name-$version.tar.gz \ +source=(http://www.fukt.bsnet.se/~per/crux/files/ports/$name-$version.tar.gz \ core.rsync opt.rsync contrib.rsync.inactive) build () {

1 0

r1718 - crux-2.2/ports/core/pkgutils
by crux＠crux.nu 14 Aug '06

14 Aug '06

Author: jw Date: 2006-08-14 10:39:20 +0200 (Mon, 14 Aug 2006) New Revision: 1718 Modified: crux-2.2/ports/core/pkgutils/Pkgfile Log: pkgutils: fix download url Modified: crux-2.2/ports/core/pkgutils/Pkgfile =================================================================== --- crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-13 12:37:46 UTC (rev 1717) +++ crux-2.2/ports/core/pkgutils/Pkgfile 2006-08-14 08:39:20 UTC (rev 1718) @@ -5,7 +5,7 @@ name=pkgutils version=5.20 release=2 -source=(http://www.fukt.bth.se/~per/pkgutils/$name-$version.tar.gz \ +source=(http://www.fukt.bsnet.se/~per/pkgutils/$name-$version.tar.gz \ $name-largefiles.patch) build () {

1 0

r1717 - tools/webtools/timeline
by crux＠crux.nu 13 Aug '06

13 Aug '06

Author: sip Date: 2006-08-13 14:37:46 +0200 (Sun, 13 Aug 2006) New Revision: 1717 Modified: tools/webtools/timeline/rss.php Log: timeline: added notes to rss, more compact description for feed title Modified: tools/webtools/timeline/rss.php =================================================================== --- tools/webtools/timeline/rss.php 2006-08-13 11:38:41 UTC (rev 1716) +++ tools/webtools/timeline/rss.php 2006-08-13 12:37:46 UTC (rev 1717) @@ -1,16 +1,15 @@ <?php require_once('DB.php'); -$days = 15; -if (isset($_GET['days'])) { - $days = intval($_GET['days']); +$limit = 10; +if (isset($_GET['limit'])) { + $limit = intval($_GET['limit']); } $dsn = 'sqlite:////home/crux/public_html/local/timeline.db'; $db =& DB::connect($dsn); if (DB::isError($db)) die("Cannot connect to database"); $db->setFetchMode(DB_FETCHMODE_ASSOC); -$from = time() - ($days * 24 * 60 * 60); -$sql = "select * from events where event_tstamp >= $from order by event_tstamp desc"; +$sql = "select * from events order by event_tstamp desc limit $limit"; $res =& $db->Query($sql); if (DB::isError($res)) die("Query error"); @@ -18,10 +17,6 @@ $timeline .= '<?xml version="1.0"?>'."\n"; $timeline .= '<rss version="2.0"><channel><title>CRUX timeline</title><description>CRUX: timeline (commits, tasks, wiki edits)</description><link>http://crux.nu</link>'; while ($evt =& $res->fetchRow()) { - $event_description = $evt['event_description']; - if ($evt['event_notes'] != "") { - $event_description .= ": ".$evt['event_notes']; - } $url = $evt['event_url']; $url = str_replace("&","&", $url); # strip diff link @@ -34,12 +29,24 @@ $description = preg_replace('/\[\[(\w+)\.(\w+)\]\] /s','$1.$2', $description); # strip wiki user with ~ $description = preg_replace('/\[\[~(\w+)\]\] /s','$1', $description); - - $evt['event_notes'] = "Notes"; + # Compact description for svn commits + $description = preg_replace('/Revision (.*) committed by .*/','r$1', $description); + # Compact description for wiki edits + $description = str_replace ("Wiki page ","", $description); + + $notes = ""; + $titlenotes = ""; + if ($evt['event_notes'] != "") { + $notes = $evt['event_notes']; + $titlenotes = ": ".$notes; + if (strlen($notes) > 40) { + $titlenotes = ": ".substr($notes,0,40)."..."; + } + } $timeline .= " <item> - <title>$description</title> - <description></description> + <title>$description$titlenotes</title> + <description>$notes</description> <link>$url</link> </item>\n"; }

1 0

r1716 - crux-2.2/ports/opt/git
by crux＠crux.nu 13 Aug '06

13 Aug '06

Author: tilman Date: 2006-08-13 13:38:41 +0200 (Sun, 13 Aug 2006) New Revision: 1716 Modified: crux-2.2/ports/opt/git/.footprint crux-2.2/ports/opt/git/.md5sum crux-2.2/ports/opt/git/Pkgfile Log: git: updated to 1.4.2 Modified: crux-2.2/ports/opt/git/.footprint =================================================================== --- crux-2.2/ports/opt/git/.footprint 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/.footprint 2006-08-13 11:38:41 UTC (rev 1716) @@ -46,6 +46,7 @@ -rwxr-xr-x root/root usr/bin/git-imap-send -rwxr-xr-x root/root usr/bin/git-index-pack -rwxr-xr-x root/root usr/bin/git-init-db +-rwxr-xr-x root/root usr/bin/git-instaweb -rwxr-xr-x root/root usr/bin/git-local-fetch -rwxr-xr-x root/root usr/bin/git-log -rwxr-xr-x root/root usr/bin/git-lost-found @@ -106,6 +107,7 @@ -rwxr-xr-x root/root usr/bin/git-ssh-upload -rwxr-xr-x root/root usr/bin/git-status -rwxr-xr-x root/root usr/bin/git-stripspace +-rwxr-xr-x root/root usr/bin/git-svn -rwxr-xr-x root/root usr/bin/git-svnimport -rwxr-xr-x root/root usr/bin/git-symbolic-ref -rwxr-xr-x root/root usr/bin/git-tag @@ -170,6 +172,7 @@ -rw-r--r-- root/root usr/man/man1/git-imap-send.1.gz -rw-r--r-- root/root usr/man/man1/git-index-pack.1.gz -rw-r--r-- root/root usr/man/man1/git-init-db.1.gz +-rw-r--r-- root/root usr/man/man1/git-instaweb.1.gz -rw-r--r-- root/root usr/man/man1/git-local-fetch.1.gz -rw-r--r-- root/root usr/man/man1/git-log.1.gz -rw-r--r-- root/root usr/man/man1/git-lost-found.1.gz @@ -224,6 +227,7 @@ -rw-r--r-- root/root usr/man/man1/git-ssh-upload.1.gz -rw-r--r-- root/root usr/man/man1/git-status.1.gz -rw-r--r-- root/root usr/man/man1/git-stripspace.1.gz +-rw-r--r-- root/root usr/man/man1/git-svn.1.gz -rw-r--r-- root/root usr/man/man1/git-svnimport.1.gz -rw-r--r-- root/root usr/man/man1/git-symbolic-ref.1.gz -rw-r--r-- root/root usr/man/man1/git-tag.1.gz Modified: crux-2.2/ports/opt/git/.md5sum =================================================================== --- crux-2.2/ports/opt/git/.md5sum 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/.md5sum 2006-08-13 11:38:41 UTC (rev 1716) @@ -1,2 +1,2 @@ -cde57291a326b958802e453b48a0e0bf git-1.4.1.1.tar.bz2 -252b85ac0ffb73d8f13fa1f45dd745b5 git-manpages-1.4.1.1.tar.bz2 +3fc9d2ab17b1060b908236d48102e9fa git-1.4.2.tar.bz2 +91e0d70c1856933f9b7699990e7d797b git-manpages-1.4.2.tar.bz2 Modified: crux-2.2/ports/opt/git/Pkgfile =================================================================== --- crux-2.2/ports/opt/git/Pkgfile 2006-08-12 09:30:55 UTC (rev 1715) +++ crux-2.2/ports/opt/git/Pkgfile 2006-08-13 11:38:41 UTC (rev 1716) @@ -5,7 +5,7 @@ # Nice to have: tk name=git -version=1.4.1.1 +version=1.4.2 release=1 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$ver…

1 0

r1715 - crux-2.2/ports/core/lilo
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sip Date: 2006-08-12 11:30:55 +0200 (Sat, 12 Aug 2006) New Revision: 1715 Added: crux-2.2/ports/core/lilo/lilo-22.7.3.patch Removed: crux-2.2/ports/core/lilo/lilo-22.7.2.patch Modified: crux-2.2/ports/core/lilo/.md5sum crux-2.2/ports/core/lilo/Pkgfile Log: lilo: updated to 22.7.3 Modified: crux-2.2/ports/core/lilo/.md5sum =================================================================== --- crux-2.2/ports/core/lilo/.md5sum 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/.md5sum 2006-08-12 09:30:55 UTC (rev 1715) @@ -1,3 +1,3 @@ -00123b2693be0b5c9181c0b844343d07 lilo-22.7.2.patch -2bf1eb08c449a28ebadcf66c48a26567 lilo-22.7.2.src.tar.gz +3e05c2b0e0d30e821509eaaec0bbd47c lilo-22.7.3.patch +a3aacf90482e0c07492623042b901503 lilo-22.7.3.src.tar.gz e4be19b729f2c848e0838a937f960e1b lilo.conf Modified: crux-2.2/ports/core/lilo/Pkgfile =================================================================== --- crux-2.2/ports/core/lilo/Pkgfile 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/Pkgfile 2006-08-12 09:30:55 UTC (rev 1715) @@ -3,14 +3,14 @@ # Maintainer: Per Lid�n, core-ports at crux dot nu name=lilo -version=22.7.2 +version=22.7.3 release=1 source=(http://home.san.rr.com/johninsd/pub/linux/lilo/$name-$version.src.t… \ $name-$version.patch lilo.conf) build() { cd $name-$version - patch -p1 < ../$name-$version.patch + patch -p0 < ../$name-$version.patch sed -i 's|\./checkit||g' Makefile make all make ROOT=$PKG install Deleted: crux-2.2/ports/core/lilo/lilo-22.7.2.patch =================================================================== --- crux-2.2/ports/core/lilo/lilo-22.7.2.patch 2006-08-12 07:43:26 UTC (rev 1714) +++ crux-2.2/ports/core/lilo/lilo-22.7.2.patch 2006-08-12 09:30:55 UTC (rev 1715) @@ -1,29 +0,0 @@ -diff -Nru lilo-22.7.2.orig/Makefile lilo-22.7.2/Makefile ---- lilo-22.7.2.orig/Makefile 2006-07-08 11:59:25.735532000 +0200 -+++ lilo-22.7.2/Makefile 2006-07-08 12:01:54.420824250 +0200 -@@ -64,7 +64,7 @@ - # XL_SECS=n Support for extra large (non-standard) floppies. - - CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ -- -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ -+ -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVIRTUAL \ - -DATARAID -DMDPRAID - - # set the compiler optimization level -@@ -154,7 +154,7 @@ - # - # everything needed to run, just short of installation - # --all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate -+all: lilo bootsect.b # diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate - if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ - make diagnostic; \ - make dosexe; fi -@@ -180,7 +180,6 @@ - # - test: test.img - test.img: -- ./checkit - echo Tested >test.img - # - # make the bootable diagnostic floppies Copied: crux-2.2/ports/core/lilo/lilo-22.7.3.patch (from rev 1714, crux-2.2/ports/core/lilo/lilo-22.7.2.patch) =================================================================== --- crux-2.2/ports/core/lilo/lilo-22.7.3.patch (rev 0) +++ crux-2.2/ports/core/lilo/lilo-22.7.3.patch 2006-08-12 09:30:55 UTC (rev 1715) @@ -0,0 +1,20 @@ +--- Makefile.orig 2006-08-12 11:27:22.726223250 +0200 ++++ Makefile 2006-08-12 11:28:32.070557000 +0200 +@@ -65,7 +65,7 @@ + # XL_SECS=n Support for extra large (non-standard) floppies. + + CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ +- -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ ++ -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVIRTUAL \ + -DMDPRAID + + # set the following if you wish LILO.COM to be installed +@@ -162,7 +162,7 @@ + # + # everything needed to run, just short of installation + # +-all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate ++all: lilo bootsect.b # diag1.img OBSOLETE: $(BOOTS) edit dparam.com activate + if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ + make diagnostic; \ + make dosexe; fi

1 0

r1714 - crux-2.2/ports/opt/ncftp
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sten Date: 2006-08-12 09:43:26 +0200 (Sat, 12 Aug 2006) New Revision: 1714 Modified: crux-2.2/ports/opt/ncftp/.md5sum crux-2.2/ports/opt/ncftp/Pkgfile Log: ncftp: update to 3.2.0 Modified: crux-2.2/ports/opt/ncftp/.md5sum =================================================================== --- crux-2.2/ports/opt/ncftp/.md5sum 2006-08-12 07:43:07 UTC (rev 1713) +++ crux-2.2/ports/opt/ncftp/.md5sum 2006-08-12 07:43:26 UTC (rev 1714) @@ -1 +1 @@ -66cf8dacec848eb11a70632fe9f21807 ncftp-3.1.9-src.tar.bz2 +384b7f01d725c89ccd30692628b3ac1b ncftp-3.2.0-src.tar.bz2 Modified: crux-2.2/ports/opt/ncftp/Pkgfile =================================================================== --- crux-2.2/ports/opt/ncftp/Pkgfile 2006-08-12 07:43:07 UTC (rev 1713) +++ crux-2.2/ports/opt/ncftp/Pkgfile 2006-08-12 07:43:26 UTC (rev 1714) @@ -1,10 +1,10 @@ # Description: a powerful ftp client with a very nice text-based interface # URL: http://www.ncftp.com # Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: Jan Andersson, janneand at yahoo dot com +# Packager: name=ncftp -version=3.1.9 +version=3.2.0 release=1 source=(ftp://ftp.ncftp.com/$name/$name-$version-src.tar.bz2)

1 0

r1713 - crux-2.2/ports/opt/lm_sensors
by crux＠crux.nu 12 Aug '06

12 Aug '06

Author: sten Date: 2006-08-12 09:43:07 +0200 (Sat, 12 Aug 2006) New Revision: 1713 Modified: crux-2.2/ports/opt/lm_sensors/.md5sum Log: lm_sensors: update md5sum Modified: crux-2.2/ports/opt/lm_sensors/.md5sum =================================================================== --- crux-2.2/ports/opt/lm_sensors/.md5sum 2006-08-11 22:05:56 UTC (rev 1712) +++ crux-2.2/ports/opt/lm_sensors/.md5sum 2006-08-12 07:43:07 UTC (rev 1713) @@ -1 +1 @@ -6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz +c9a1b4fc8660d2cd8715b0a05f89b83f lm_sensors-2.10.0.tar.gz

1 0

r1712 - tools/webtools/timeline
by crux＠crux.nu 11 Aug '06

11 Aug '06

Author: sip Date: 2006-08-12 00:05:56 +0200 (Sat, 12 Aug 2006) New Revision: 1712 Added: tools/webtools/timeline/rss.php Modified: tools/webtools/timeline/timeline.sql tools/webtools/timeline/tlcacher.php Log: timeline: added url field, added rss feed generator Added: tools/webtools/timeline/rss.php =================================================================== --- tools/webtools/timeline/rss.php (rev 0) +++ tools/webtools/timeline/rss.php 2006-08-11 22:05:56 UTC (rev 1712) @@ -0,0 +1,48 @@ +<?php +require_once('DB.php'); +$days = 15; +if (isset($_GET['days'])) { + $days = intval($_GET['days']); +} + +$dsn = 'sqlite:////home/crux/public_html/local/timeline.db'; +$db =& DB::connect($dsn); +if (DB::isError($db)) die("Cannot connect to database"); +$db->setFetchMode(DB_FETCHMODE_ASSOC); +$from = time() - ($days * 24 * 60 * 60); +$sql = "select * from events where event_tstamp >= $from order by event_tstamp desc"; +$res =& $db->Query($sql); +if (DB::isError($res)) die("Query error"); + +header ("Content-type: text/xml"); +$timeline .= '<?xml version="1.0"?>'."\n"; +$timeline .= '<rss version="2.0"><channel><title>CRUX timeline</title><description>CRUX: timeline (commits, tasks, wiki edits)</description><link>http://crux.nu</link>'; +while ($evt =& $res->fetchRow()) { + $event_description = $evt['event_description']; + if ($evt['event_notes'] != "") { + $event_description .= ": ".$evt['event_notes']; + } + $url = $evt['event_url']; + $url = str_replace("&","&", $url); + # strip diff link + $description = preg_replace('/$\[\[.*\]\]$/s','', $evt['event_description']); + # strip wiki link with url + $description = preg_replace('/\[\[(.*)\|(\d+)\]\]/s','$2', $description); + # strip users (svn) + $description = preg_replace('/\[\[~(.*)\|(.*)\]\]/s','$2', $description); + # strip wiki link without url + $description = preg_replace('/\[\[(\w+)\.(\w+)\]\] /s','$1.$2', $description); + # strip wiki user with ~ + $description = preg_replace('/\[\[~(\w+)\]\] /s','$1', $description); + + $evt['event_notes'] = "Notes"; + $timeline .= " + <item> + <title>$description</title> + <description></description> + <link>$url</link> + </item>\n"; +} +$timeline .= "</channel></rss>\n"; +echo $timeline; +?> Modified: tools/webtools/timeline/timeline.sql =================================================================== --- tools/webtools/timeline/timeline.sql 2006-08-10 21:40:11 UTC (rev 1711) +++ tools/webtools/timeline/timeline.sql 2006-08-11 22:05:56 UTC (rev 1712) @@ -2,10 +2,11 @@ event_id integer primary key, cache_id integer, event_tstamp integer, - event_type varchar(20), - event_date varchar(10), - event_time varchar(5), - event_user varchar(50), + event_type varchar, + event_date varchar, + event_time varchar, + event_user varchar, + event_url varchar, event_description text, event_notes text ); Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-08-10 21:40:11 UTC (rev 1711) +++ tools/webtools/timeline/tlcacher.php 2006-08-11 22:05:56 UTC (rev 1712) @@ -41,7 +41,7 @@ "sten" => "NickSteeves" ); -// Event: cache_id, tstamp, type(icon), date, time, user, description, notes +// Event: cache_id, tstamp, type(icon), date, time, user, url, description, notes $events = array(); /**************** Last cached events *******************/ @@ -101,15 +101,16 @@ $description = ""; $date = date("Y-m-d", $edate); $time = date("H:i", $edate); + $url = sprintf($task_url,$etid); switch ($etype) { case "1": // new task $icon = "task_opened"; - $description = "New task [[ ".sprintf($task_url,$etid)." | $etid ]] opened by $euser"; + $description = "New task [[$url|$etid]] opened by $euser"; $notes = $row['item_summary']; break; case "2": // task closed $icon = "task_closed"; - $description = "Task [[ ".sprintf($task_url,$etid)." | $etid ]] closed by $euser"; + $description = "Task [[$url|$etid]] closed by $euser"; if ($row['closure_comment'] != "" && $row['closure_comment'] != 0) { // weird flyspray! $notes = $row['closure_comment']; } else { @@ -130,13 +131,13 @@ case "24": case "25": $icon = "task_changed"; - $description = "Task [[ ".sprintf($task_url,$etid)." | $etid ]] modified by $euser"; + $description = "Task [[$url|$etid]] modified by $euser"; $notes = ""; break; } if ($description !== "") { $events[] = array( 'cache_id' => $cache_id, 'tstamp' => $edate, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $euser, 'description' => $description, 'notes' => $notes,); + 'time' => $time, 'user' => $euser, 'url'=> $url, 'description' => $description, 'notes' => $notes,); } } @@ -161,14 +162,15 @@ } $date = substr($revline[2],1,10); $time = substr($revline[2],12,5); - $revurl = "[[ ".sprintf($svn_url, $rev)." | $rev ]]"; + $url = sprintf($svn_url, $rev); + $revurl = "[[$url|$rev]]"; $description = "Revision $revurl committed by $user"; $tstamp = strtotime("$date $time:00"); } else { $icon = "svn_commit"; $notes = trim($line); $events[] = array( 'cache_id' => $rev, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $user, 'description' => $description, 'notes' => $notes); + 'time' => $time, 'user' => $user, 'url'=>$url, 'description' => $description, 'notes' => $notes); } } } @@ -199,19 +201,21 @@ preg_match('/(..\:..)/',$date,$matches); $time = $matches[0]; $date = date("Y-m-d", $tstamp); - - $action = "?action=diff#" . urlencode($date . " " . $time) . "|diff"; - $page_diff = trim(str_replace("]]", $action."]]", $page)) + $action = "?action=diff#" . urlencode($date . " " . $time) . "|diff"; + $page_diff = trim(str_replace("]]", $action."]]", $page)); + preg_match('/\[\[(.*)\|diff\]\]/', $page_diff, $matches); + $url = $matches[1]; + $url = "http://crux.nu/".str_replace(".","/", $url); $description = "Wiki page $page edited $user ($page_diff)"; if ($tstamp > $last_wiki) { $events[] = array( 'cache_id' => $tstamp, 'tstamp' => $tstamp, 'icon' => $icon, 'date' => $date, - 'time' => $time, 'user' => $user, 'description' => $description, 'notes' => $notes); + 'time' => $time, 'user' => $user, 'url' => $url, 'description' => $description, 'notes' => $notes); } } } /*************** Finally, all events *********************/ -$sth = $dbc->prepare("insert into events values (NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); +$sth = $dbc->prepare("insert into events values (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); foreach ($events as $evt) { $res = $dbc->execute($sth, $evt); if (DB::isError($res)) die("Query error");

1 0