From svn at pti.co.il  Thu Apr 12 20:31:50 2007
From: svn at pti.co.il (svn at pti.co.il)
Date: Thu, 12 Apr 2007 20:31:50 +0300
Subject: [Website-commit] [perl.org.il Commit] rev 340 - in site:
	new_site_bin new_site_sources
Message-ID: <200704121731.l3CHVoFK012425@pti.co.il>

Author: gabor
Date: 2007-04-12 20:31:50 +0300 (Thu, 12 Apr 2007)
New Revision: 340

Modified:
   site/new_site_bin/AllMeetings.pm
   site/new_site_bin/books.pl
   site/new_site_bin/main.pl
   site/new_site_bin/meetings.pl
   site/new_site_sources/meetings2007.yml
Log:
fix some issues reading the yml files
add meeting info on 2007.04.12


Modified: site/new_site_bin/AllMeetings.pm
===================================================================
--- site/new_site_bin/AllMeetings.pm	2007-04-12 17:08:43 UTC (rev 339)
+++ site/new_site_bin/AllMeetings.pm	2007-04-12 17:31:50 UTC (rev 340)
@@ -5,6 +5,7 @@
 
 use Exporter;
 use YAML qw(LoadFile);
+use FindBin qw($Bin);
 
 our @ISA = (qw(Exporter));
 
@@ -13,12 +14,12 @@
 sub get_all_meetings
 {
     my %data;
-    for my $file (glob "new_site_sources/meetings*.yml") {
+    for my $file (glob "$Bin/../new_site_sources/meetings*.yml") {
+        #print "Processing $file\n";
         my $r = LoadFile($file); 
         %data = (%data, %$r);
-        print "Processing $file\n";
     }
-    return \%data;
+    return %data;
 }
 
 1;

Modified: site/new_site_bin/books.pl
===================================================================
--- site/new_site_bin/books.pl	2007-04-12 17:08:43 UTC (rev 339)
+++ site/new_site_bin/books.pl	2007-04-12 17:31:50 UTC (rev 340)
@@ -18,7 +18,6 @@
 my %opts;
 GetOptions(\%opts, "outdir=s");
 
-#use BooksData qw(%books);
 my $books = LoadFile("$Bin/../new_site_sources/books.yml");
 
 my $template_file       = "$Bin/../new_site_sources/templates/books_main.tmpl";

Modified: site/new_site_bin/main.pl
===================================================================
--- site/new_site_bin/main.pl	2007-04-12 17:08:43 UTC (rev 339)
+++ site/new_site_bin/main.pl	2007-04-12 17:31:50 UTC (rev 340)
@@ -3,13 +3,15 @@
 use HTML::Template;
 use Getopt::Long qw(GetOptions);
 use FindBin qw($Bin);
-use BooksData qw(%books);
 use POSIX qw(mktime strftime);
+use YAML qw(LoadFile);
 
 use lib $Bin;
 
 use Common;
 
+my $books = LoadFile("$Bin/../new_site_sources/books.yml");
+
 ###############################################################################
 # This is the Perl script for creating the main pages (index, about, etc.)
 # from the templates.
@@ -229,7 +231,7 @@
 	} elsif ($file =~ m/meetings/) {
         use AllMeetings;
 
-        my %meetings = %{get_all_meetings()};
+        my %meetings = get_all_meetings();
 
 		my %past_annual; # We'll collect the monthly meetins in a temporary hash and then put them
 		my @past;        # in this array - one entry for each year.
@@ -373,10 +375,10 @@
 sub populate_books_table {
 	my $books_array_ref;
 	my $number = 1;
-	for my $name (sort keys %books) {
-		my $isbn      = $books{$name}->{"details"}->[-1];
-		my $publisher = $books{$name}->{"details"}->[0];
-		my $cuser     = $books{$name}->{"users"}->[0];
+	for my $name (sort keys %$books) {
+		my $isbn      = $books->{$name}->{"details"}->[-1];
+		my $publisher = $books->{$name}->{"details"}->[0];
+		my $cuser     = $books->{$name}->{"users"}->[0];
 		if (-e "$outfiles_basedir/books/$isbn.html") {
 			$name = '<a href="books/' . $isbn . '.html">' . "$name</a>";
 		}

Modified: site/new_site_bin/meetings.pl
===================================================================
--- site/new_site_bin/meetings.pl	2007-04-12 17:08:43 UTC (rev 339)
+++ site/new_site_bin/meetings.pl	2007-04-12 17:31:50 UTC (rev 340)
@@ -21,7 +21,7 @@
 
 use AllMeetings;
 
-my %meetings = %{get_all_meetings()};
+my %meetings = get_all_meetings();
 
 my $template_file       = "$Bin/../new_site_sources/templates/meetings_main.tmpl";
 my $outfiles_basedir    = $opts{outdir} || "$Bin/../new_site_sources/site/meetings";

Modified: site/new_site_sources/meetings2007.yml
===================================================================
--- site/new_site_sources/meetings2007.yml	2007-04-12 17:08:43 UTC (rev 339)
+++ site/new_site_sources/meetings2007.yml	2007-04-12 17:31:50 UTC (rev 340)
@@ -28,7 +28,7 @@
     - name: Gabor Szabo
     - name: Oren Izmirli
     - name: Ran Eilam
-    - name: Thomas
+    - name: Thomas Mayer
     - name: Micha Nasriachi
     - name: Yuval Yaari
     - name: Ron Kass
@@ -86,3 +86,26 @@
   location: "F5 Networks' offices at Ramat HaXayal in 24 HaBarzel St., Tel Aviv"
   participants: []
   report_text: ''
+20070412:
+  agenda_items:
+    - item: '18:30-19:30 -- Shmuel Fomberg - '
+    - item: '19:45-20:45 -- Yuval Yaari - Regular Expressions'
+  items:
+    - description: Shmuel Fomberg about embedding Perl in C
+      speaker: Shmuel Fomberg
+      title: Embedding Perl in C
+    - description: Yuval Yaari about Regular Expressions
+      speaker: Yuval Yaari
+      title: Regular Expressions
+  location: "F5 Networks' offices at Ramat HaXayal in 24 HaBarzel St., Tel Aviv"
+  participants:
+    - name: Shlomi Fish
+    - name: Shmuel Fomberg
+    - name: Uri Bruck
+    - name: Gabor Szabo
+    - name: Ran Eilam
+    - name: Thomas Mayer
+    - name: Yuval Yaari
+    - name: Shlomo Yona
+  report_text: |
+    There is no report yet, we are arguing with Yuval what will /foo|foobar/ match.