rasmus		Sun Jul 20 06:58:14 2008 UTC

  Added files:                 
    /presentations/slides/intro	architecture_title.xml 

  Modified files:              
    /presentations	oscon08.xml 
    /presentations/slides/intro	lac1.xml lac11.xml lac7.xml twit1.xml 
                               	twit3.xml twit_db4.xml twit_db6.xml 
  Log:
  Tweaks
  
  
http://cvs.php.net/viewvc.cgi/presentations/oscon08.xml?r1=1.2&r2=1.3&diff_format=u
Index: presentations/oscon08.xml
diff -u presentations/oscon08.xml:1.2 presentations/oscon08.xml:1.3
--- presentations/oscon08.xml:1.2	Sun Jul 20 06:20:40 2008
+++ presentations/oscon08.xml	Sun Jul 20 06:58:13 2008
@@ -52,6 +52,7 @@
 <slide>slides/intro/twit3.xml</slide>
 
 <!-- Architecture -->
+<slide>slides/intro/architecture_title.xml</slide>
 <slide>slides/intro/twit_db1.xml</slide>
 <slide>slides/intro/twit_db2.xml</slide>
 <slide>slides/intro/twit_db3.xml</slide>
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/lac1.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/lac1.xml
diff -u presentations/slides/intro/lac1.xml:1.1 presentations/slides/intro/lac1.xml:1.2
--- presentations/slides/intro/lac1.xml:1.1	Sun Jul 20 05:56:32 2008
+++ presentations/slides/intro/lac1.xml	Sun Jul 20 06:58:13 2008
@@ -35,7 +35,8 @@
 Lifting the server siege...      done.
 Transactions:                615 hits
 Availability:             100.00 %
-Elapsed time:              29.88 secsData transferred:           6.36 MB
+Elapsed time:              29.88 secs
+Data transferred:           6.36 MB
 Response time:              |ffff00|0.24 secs|
 Transaction rate:          |ffff00|20.58 trans/sec|
 Throughput:             0.21 MB/sec
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/lac11.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/lac11.xml
diff -u presentations/slides/intro/lac11.xml:1.1 presentations/slides/intro/lac11.xml:1.2
--- presentations/slides/intro/lac11.xml:1.1	Sun Jul 20 05:56:32 2008
+++ presentations/slides/intro/lac11.xml	Sun Jul 20 06:58:13 2008
@@ -2,12 +2,16 @@
 
 <break lines="1" />
 
+<blurb>HTML should look like HTML</blurb>
+
+<break lines="1" />
+
 <example fontsize="1.4em" type="shell" title="Before"><![CDATA[
 Response time:              |ffff00|0.10 secs|
 Transaction rate:          |ffff00|49.84 trans/sec|
 ]]></example>
 
-<example fontsize="1.4em" type="shell" title="HTML should look like HTML"><![CDATA[
+<example fontsize="1.4em" type="shell" title="After"><![CDATA[
 % siege |ffff00|-H| "Cookie: rememberme=1%3A195e06ce1b0c466b62c0d0025611fe72" \
         |ffff00|-c| 5 "http://laconica2.localhost/index.php?action=public" \
         |ffff00|-b| |ffff00|-t|30s
@@ -19,8 +23,8 @@
 Availability:		      100.00 %
 Elapsed time:		       30.19 secs
 Data transferred:	       17.59 MB
-Response time:		        0.09 secs
-Transaction rate:	       56.84 trans/sec
+Response time:		        |ffff00|0.09 secs|
+Transaction rate:	       |ffff00|56.84 trans/sec|
 Throughput:		        0.58 MB/sec
 Concurrency:		        4.99
 Successful transactions:        1716
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/lac7.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/lac7.xml
diff -u presentations/slides/intro/lac7.xml:1.1 presentations/slides/intro/lac7.xml:1.2
--- presentations/slides/intro/lac7.xml:1.1	Sun Jul 20 05:56:32 2008
+++ presentations/slides/intro/lac7.xml	Sun Jul 20 06:58:13 2008
@@ -14,6 +14,8 @@
 % dot -Tpng -o 1.png inclued.out.dot
 ]]></example>
 
+<break lines="1" />
+
 <image filename="laconica.png" align="center"/>
 
 </slide>
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/twit1.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/twit1.xml
diff -u presentations/slides/intro/twit1.xml:1.1 presentations/slides/intro/twit1.xml:1.2
--- presentations/slides/intro/twit1.xml:1.1	Sun Jul 20 05:56:32 2008
+++ presentations/slides/intro/twit1.xml	Sun Jul 20 06:58:13 2008
@@ -22,8 +22,8 @@
 Availability:		      100.00 %
 Elapsed time:		       30.13 secs
 Data transferred:	       58.28 MB
-Response time:		        0.02 secs
-Transaction rate:	      251.54 trans/sec
+Response time:		        |ffff00|0.02 secs|
+Transaction rate:	      |ffff00|251.54 trans/sec|
 Throughput:		        1.93 MB/sec
 Concurrency:		        4.99
 Successful transactions:        7579
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/twit3.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/twit3.xml
diff -u presentations/slides/intro/twit3.xml:1.1 presentations/slides/intro/twit3.xml:1.2
--- presentations/slides/intro/twit3.xml:1.1	Sun Jul 20 05:56:32 2008
+++ presentations/slides/intro/twit3.xml	Sun Jul 20 06:58:13 2008
@@ -14,8 +14,16 @@
 % dot -Tpng -o 1.png inclued.out.dot
 ]]></example>
 
+<break lines="1" />
+
+<blurb align="center">For the front page</blurb>
 <image filename="twit2.png" align="center"/>
 
+<break lines="1" />
+
+<blurb align="center">For the query tracking page</blurb>
 <image filename="twit.png" align="center"/>
 
+<break lines="3" />
+
 </slide>
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/twit_db4.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/twit_db4.xml
diff -u presentations/slides/intro/twit_db4.xml:1.1 presentations/slides/intro/twit_db4.xml:1.2
--- presentations/slides/intro/twit_db4.xml:1.1	Sun Jul 20 06:19:21 2008
+++ presentations/slides/intro/twit_db4.xml	Sun Jul 20 06:58:13 2008
@@ -36,8 +36,10 @@
                  :profile_image,:query,:assigned)");
       $params = array(':id'=>$record['id'], ':ctime'=>strtotime($record['created_at']),
                       ':msg'=>$record['text'], ':to_user_id'=>$record['to_user_id'],
-                      ':from_user'=>$record['from_user'],':from_user_id'=>$record['from_user_id'],
-                      ':iso'=>$record['iso_language_code'],':profile_image'=>$record['profile_image_url'],
+                      ':from_user'=>$record['from_user'],
+                      ':from_user_id'=>$record['from_user_id'],
+                      ':iso'=>$record['iso_language_code'],
+                      ':profile_image'=>$record['profile_image_url'],
                       ':query'=>$record['query'],':assigned'=>$record['assigned']);
       $stmt->execute($params);
     } catch (PDOException $e) {
http://cvs.php.net/viewvc.cgi/presentations/slides/intro/twit_db6.xml?r1=1.1&r2=1.2&diff_format=u
Index: presentations/slides/intro/twit_db6.xml
diff -u presentations/slides/intro/twit_db6.xml:1.1 presentations/slides/intro/twit_db6.xml:1.2
--- presentations/slides/intro/twit_db6.xml:1.1	Sun Jul 20 06:19:21 2008
+++ presentations/slides/intro/twit_db6.xml	Sun Jul 20 06:58:13 2008
@@ -6,20 +6,20 @@
 </blurb>
 
 <example result="0" marginright="1em"><![CDATA[<?php
-  include './db.inc';
-  include './db_twits.inc';
+include './db.inc';
+include './db_twits.inc';
 
-  $twits = new twits;
-  $query = $_POST['query'];
+$twits = new twits;
+$query = $_POST['query'];
 
-  header("Content-type: application/json");
+header("Content-type: application/json");
 
-  switch($_REQUEST['action']) {
-    case 'remove_old':
-       $twits->remove_old($query,$_SERVER['REQUEST_TIME']-(14*24*3600));
-       echo json_encode('update'=>'Old tweets have been removed');
-       break;
-  }
+switch($_REQUEST['action']) {
+  case 'remove_old':
+    $twits->remove_old($query,$_SERVER['REQUEST_TIME']-(14*24*3600));
+    echo json_encode('update'=>'Old tweets have been removed');
+    break;
+}
 ?>]]></example>
 
 </slide>

http://cvs.php.net/viewvc.cgi/presentations/slides/intro/architecture_title.xml?view=markup&rev=1.1
Index: presentations/slides/intro/architecture_title.xml
+++ presentations/slides/intro/architecture_title.xml
<slide title="Architecture">
<break lines="10" />
<blurb fontsize="18em" align="center">Architecture</blurb>
</slide>