From steve@cat-box.net  Mon Apr  1 10:54:46 2002
From: steve@cat-box.net (Steve Alexander)
Date: Mon, 1 Apr 2002 05:54:46 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - ApproveJobs.pt:1.5 JobEditView.pt:1.3 JobListView.pt:1.4 JobPreviewView.pt:1.3 JobView.pt:1.6
Message-ID: <200204011054.g31Askw01361@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv1347

Modified Files:
	ApproveJobs.pt JobEditView.pt JobListView.pt JobPreviewView.pt 
	JobView.pt 
Log Message:
changed page template namespaces:

  here --> context  (actually, there were none of these)
  container --> view



=== Packages/JobBoardEx/ApproveJobs.pt 1.4 => 1.5 ===
     <tr><th>Defer</th><th>Approve</th><th>Discard</th>
     </tr>
-    <tr tal:repeat="job container/getPendingJobs"
+    <tr tal:repeat="job view/getPendingJobs"
 	style="text-align:center">
 	<td><input name="job_N" type="radio" value="defer" checked
 		   tal:attributes="name string:job_${job/id}"></td>


=== Packages/JobBoardEx/JobEditView.pt 1.2 => 1.3 ===
     <tr><td>Submitter:</td>
 	<td><input name="submitter" type="text" value="" size="72"
-	           tal:attributes="value container/getSubmitter|default" />
+	           tal:attributes="value view/getSubmitter|default" />
 	</td>
     </tr>
     <tr><td>Summary:</td>
 	<td><input name="summary" type="text" value="" size="72"
-	           tal:attributes="value container/getSummary|default" />
+	           tal:attributes="value view/getSummary|default" />
 	</td>
     </tr>
     <tr><td>Description:</td>
 	<td><textarea cols=72 rows=20 name="description" type="text"
-	     ><span tal:replace="container/getDescription|nothing"
+	     ><span tal:replace="view/getDescription|nothing"
                    /></textarea>
 	</td>
     </tr>
     <tr><td>Contact:</td>
 	<td><input name="contact" type="text" value="" size="72"
-	           tal:attributes="value container/getContact|default" />
+	           tal:attributes="value view/getContact|default" />
 	</td>
     </tr>
     <tr><td colspan="2">


=== Packages/JobBoardEx/JobListView.pt 1.3 => 1.4 ===
 <table>
 
-<tr tal:repeat="job container/getApprovedJobs">
+<tr tal:repeat="job view/getApprovedJobs">
     <td>
     <a href="jobid" tal:attributes="href string:../${job/id}">
     <span tal:replace="job/summary">A job summary</span></A>


=== Packages/JobBoardEx/JobPreviewView.pt 1.2 => 1.3 ===
 	<table border=0>
 	<tr><td>Submitter:</td>
-	    <td tal:content="container/getSubmitter">aperson@dom.ain</td>
+	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
 	</tr>
 	<tr><td>Summary:</td>
-	    <td tal:content="container/getSummary">The best job on the net</td>
+	    <td tal:content="view/getSummary">The best job on the net</td>
 	</tr>
 	<tr><td>Description:</td>
-	    <td tal:content="container/getDescription">This is really really
+	    <td tal:content="view/getDescription">This is really really
 		    really the best job on the Internet</td>
 	</tr>
 	<tr><td>Contact:</td>
-	    <td tal:content="container/getContact">bperson@dom.ain</td>
+	    <td tal:content="view/getContact">bperson@dom.ain</td>
 	</tr>
 	</table>
 
@@ -28,13 +28,13 @@
 	</td></tr>
     </table>
 	<input name="submitter" type="hidden" value="Submitter" size="72"
-	           tal:attributes="value container/getSubmitter" />
+	           tal:attributes="value view/getSubmitter" />
 	<input name="summary" type="hidden" value="Summary" size="72"
-	           tal:attributes="value container/getSummary" />
+	           tal:attributes="value view/getSummary" />
 	<input name="description" type="hidden" value=""
-	           tal:attributes="value container/getDescription" />
+	           tal:attributes="value view/getDescription" />
 	<input name="contact" type="hidden" value="" size="72"
-	           tal:attributes="value container/getContact" />
+	           tal:attributes="value view/getContact" />
     </form>    
 
 </body>


=== Packages/JobBoardEx/JobView.pt 1.5 => 1.6 ===
 	<table border=0>
 	<tr><td>Submitter:</td>
-	    <td tal:content="container/getSubmitter">aperson@dom.ain</td>
+	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
 	</tr>
 	<tr><td>Summary:</td>
-	    <td tal:content="container/getSummary">The best job on the net</td>
+	    <td tal:content="view/getSummary">The best job on the net</td>
 	</tr>
 	<tr><td>Description:</td>
-	    <td tal:content="container/getDescription">This is really really
+	    <td tal:content="view/getDescription">This is really really
 		    really the best job on the Internet</td>
 	</tr>
 	<tr><td>Contact:</td>
-	    <td tal:content="container/getContact">bperson@dom.ain</td>
+	    <td tal:content="view/getContact">bperson@dom.ain</td>
 	</tr>
 	</table>
 



From steve@cat-box.net  Tue Apr  2 13:32:59 2002
From: steve@cat-box.net (Steve Alexander)
Date: Tue, 2 Apr 2002 08:32:59 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - ApproveJobs.pt:1.6 JobEditView.pt:1.4 JobPreviewView.pt:1.4 JobView.pt:1.7
Message-ID: <200204021332.g32DWxJ16997@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv15265

Modified Files:
	ApproveJobs.pt JobEditView.pt JobPreviewView.pt JobView.pt 
Log Message:
Converted tabs to spaces.
Changed action="" to action="." so that it works with Zope3 in cvs.

This is because the browser was going to a page foo/bar/index.html
and seeing a form with action="".

On submitting the form, the URL goes in place of the action.
The Zope publisher gets a request for foo/bar/index.html, with the 
request to call a method "preview" (for example). So, the publisher
was trying to traverse to foo/bar/index.html/preview, which fails of
course.

Perhaps what the publisher should say is: if I'm traversing, and I can't
traverse any further, but I've got a method from a form, I should back up
one step then traverse the method.

If that were implemented, then action="" and action="." should work the
same.


=== Packages/JobBoardEx/ApproveJobs.pt 1.5 => 1.6 ===
 <body>
 
-    <form action="" method="post">
+    <form action="." method="post">
     <table border=0>
     <tr><th colspan=3>Action</th>
-	<th rowspan=2>Summary</th>
+        <th rowspan=2>Summary</th>
     </tr>
     <tr><th>Defer</th><th>Approve</th><th>Discard</th>
     </tr>
     <tr tal:repeat="job view/getPendingJobs"
-	style="text-align:center">
-	<td><input name="job_N" type="radio" value="defer" checked
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td><input name="job_N" type="radio" value="approve"
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td><input name="job_N" type="radio" value="discard"
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td tal:content="job/summary">The best job on the Internet</td>
+        style="text-align:center">
+        <td><input name="job_N" type="radio" value="defer" checked
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td><input name="job_N" type="radio" value="approve"
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td><input name="job_N" type="radio" value="discard"
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td tal:content="job/summary">The best job on the Internet</td>
     </tr>
     <tr><td colspan="3">
-	<input name="submit:method" type="submit" value="Submit">
-	<input name="back:method" type="submit" value="Back to summary">
+        <input name="submit:method" type="submit" value="Submit">
+        <input name="back:method" type="submit" value="Back to summary">
     </td></tr>
     </table>
     </form>
-	    
+            
 </body>
 </html>


=== Packages/JobBoardEx/JobEditView.pt 1.3 => 1.4 ===
 <body>
 <h1>Enter new job data</h1>
-    <form action="" method="post">
+    <form action="." method="post">
     <table border=0>
     <tr><td>Submitter:</td>
-	<td><input name="submitter" type="text" value="" size="72"
-	           tal:attributes="value view/getSubmitter|default" />
-	</td>
+        <td><input name="submitter" type="text" value="" size="72"
+                   tal:attributes="value view/getSubmitter|default" />
+        </td>
     </tr>
     <tr><td>Summary:</td>
-	<td><input name="summary" type="text" value="" size="72"
-	           tal:attributes="value view/getSummary|default" />
-	</td>
+        <td><input name="summary" type="text" value="" size="72"
+                   tal:attributes="value view/getSummary|default" />
+        </td>
     </tr>
     <tr><td>Description:</td>
-	<td><textarea cols=72 rows=20 name="description" type="text"
-	     ><span tal:replace="view/getDescription|nothing"
+        <td><textarea cols=72 rows=20 name="description" type="text"
+             ><span tal:replace="view/getDescription|nothing"
                    /></textarea>
-	</td>
+        </td>
     </tr>
     <tr><td>Contact:</td>
-	<td><input name="contact" type="text" value="" size="72"
-	           tal:attributes="value view/getContact|default" />
-	</td>
+        <td><input name="contact" type="text" value="" size="72"
+                   tal:attributes="value view/getContact|default" />
+        </td>
     </tr>
     <tr><td colspan="2">
-	<input name="preview:method" type="submit" value="Preview">
-	<input name="cancel:method" type="submit" value="Cancel">
-	<input name="reset" type="reset" value="Reset">
-	</td>
+        <input name="preview:method" type="submit" value="Preview">
+        <input name="cancel:method" type="submit" value="Cancel">
+        <input name="reset" type="reset" value="Reset">
+        </td>
     </tr>
     </table>
     </form>    


=== Packages/JobBoardEx/JobPreviewView.pt 1.3 => 1.4 ===
 <body>
 
-    <form action="" method="post">
+    <form action="." method="post">
 
-	<table border=0>
-	<tr><td>Submitter:</td>
-	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
-	</tr>
-	<tr><td>Summary:</td>
-	    <td tal:content="view/getSummary">The best job on the net</td>
-	</tr>
-	<tr><td>Description:</td>
-	    <td tal:content="view/getDescription">This is really really
-		    really the best job on the Internet</td>
-	</tr>
-	<tr><td>Contact:</td>
-	    <td tal:content="view/getContact">bperson@dom.ain</td>
-	</tr>
-	</table>
+        <table border=0>
+        <tr><td>Submitter:</td>
+            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+        </tr>
+        <tr><td>Summary:</td>
+            <td tal:content="view/getSummary">The best job on the net</td>
+        </tr>
+        <tr><td>Description:</td>
+            <td tal:content="view/getDescription">This is really really
+                    really the best job on the Internet</td>
+        </tr>
+        <tr><td>Contact:</td>
+            <td tal:content="view/getContact">bperson@dom.ain</td>
+        </tr>
+        </table>
 
     <table border=0>
-	<tr><td>
-	<input name="submit:method" type="submit" value="Submit">
-	<input name="edit:method" type="submit" value="Edit">
-	<input name="cancel:method" type="submit" value="Cancel">
-	</td></tr>
+        <tr><td>
+        <input name="submit:method" type="submit" value="Submit">
+        <input name="edit:method" type="submit" value="Edit">
+        <input name="cancel:method" type="submit" value="Cancel">
+        </td></tr>
     </table>
-	<input name="submitter" type="hidden" value="Submitter" size="72"
-	           tal:attributes="value view/getSubmitter" />
-	<input name="summary" type="hidden" value="Summary" size="72"
-	           tal:attributes="value view/getSummary" />
-	<input name="description" type="hidden" value=""
-	           tal:attributes="value view/getDescription" />
-	<input name="contact" type="hidden" value="" size="72"
-	           tal:attributes="value view/getContact" />
+        <input name="submitter" type="hidden" value="Submitter" size="72"
+                   tal:attributes="value view/getSubmitter" />
+        <input name="summary" type="hidden" value="Summary" size="72"
+                   tal:attributes="value view/getSummary" />
+        <input name="description" type="hidden" value=""
+                   tal:attributes="value view/getDescription" />
+        <input name="contact" type="hidden" value="" size="72"
+                   tal:attributes="value view/getContact" />
     </form>    
 
 </body>


=== Packages/JobBoardEx/JobView.pt 1.6 => 1.7 ===
     <form action=".." method="get">
 
-	<table border=0>
-	<tr><td>Submitter:</td>
-	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
-	</tr>
-	<tr><td>Summary:</td>
-	    <td tal:content="view/getSummary">The best job on the net</td>
-	</tr>
-	<tr><td>Description:</td>
-	    <td tal:content="view/getDescription">This is really really
-		    really the best job on the Internet</td>
-	</tr>
-	<tr><td>Contact:</td>
-	    <td tal:content="view/getContact">bperson@dom.ain</td>
-	</tr>
-	</table>
+        <table border=0>
+        <tr><td>Submitter:</td>
+            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+        </tr>
+        <tr><td>Summary:</td>
+            <td tal:content="view/getSummary">The best job on the net</td>
+        </tr>
+        <tr><td>Description:</td>
+            <td tal:content="view/getDescription">This is really really
+                    really the best job on the Internet</td>
+        </tr>
+        <tr><td>Contact:</td>
+            <td tal:content="view/getContact">bperson@dom.ain</td>
+        </tr>
+        </table>
 
     <table border=0>
-	<tr><td>
-	<input type="submit" value="Back to summary">
-	</td></tr>
+        <tr><td>
+        <input type="submit" value="Back to summary">
+        </td></tr>
     </table>
     </form>    
 



From garyposter@earthlink.net  Tue Apr  2 16:50:34 2002
From: garyposter@earthlink.net (Gary Poster)
Date: Tue, 2 Apr 2002 11:50:34 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - JobCreateView.pt:1.1.2.1 add_confirmed.pt:1.1.2.1 ApproveJobs.pt:1.5.2.1 IJob.py:1.6.2.1 JobEditView.pt:1.3.2.1 JobList.zcml:1.13.2.1 JobListView.pt:1.4.2.1 JobView.pt:1.6.2.1 JobView.py:1.8.2.1
Message-ID: <200204021650.g32GoYn02552@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv2460

Modified Files:
      Tag: gary-pre_create_views_example-branch
	ApproveJobs.pt IJob.py JobEditView.pt JobList.zcml 
	JobListView.pt JobView.pt JobView.py 
Added Files:
      Tag: gary-pre_create_views_example-branch
	JobCreateView.pt add_confirmed.pt 
Log Message:
changes to illustrate (somewhat poorly) the pre-create views functionality


=== Added File Packages/JobBoardEx/JobCreateView.pt ===
<html>
<head>
<title>Enter new job data</title>
</head>
<body>
<h1>Enter new job data</h1>
    <form action="action" method="post">
    <table border=0>
    <tr><td>Submitter:</td>
	<td><input name="submitter" type="text" value="" size="72"
	            />
	</td>
    </tr>
    <tr><td>Summary:</td>
	<td><input name="summary" type="text" value="" size="72"
	            />
	</td>
    </tr>
    <tr><td>Description:</td>
	<td><textarea cols=72 rows=20 name="description" type="text"
	     ></textarea>
	</td>
    </tr>
    <tr><td>Contact:</td>
	<td><input name="contact" type="text" value="" size="72"
	           />
	</td>
    </tr>
    <tr><td colspan="2">
	<!-- input name="preview:method" type="submit" value="Preview" -->
	<input name="submit" type="submit" value="Create">
	<input name="reset" type="reset" value="Reset">
	</td>
    </tr>
    </table>
    </form>    

</body>
</html>


=== Added File Packages/JobBoardEx/add_confirmed.pt ===
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
      metal:use-macro="presentation/standard_macros/html">
  -->
<body>

<p> Object added successfully. </p>

</body>
</html>


=== Packages/JobBoardEx/ApproveJobs.pt 1.5 => 1.5.2.1 ===
     <tr><th>Defer</th><th>Approve</th><th>Discard</th>
     </tr>
-    <tr tal:repeat="job view/getPendingJobs"
+    <tr tal:repeat="job container/getPendingJobs"
 	style="text-align:center">
 	<td><input name="job_N" type="radio" value="defer" checked
 		   tal:attributes="name string:job_${job/id}"></td>


=== Packages/JobBoardEx/IJob.py 1.6 => 1.6.2.1 ===
 from Interface.Attribute import Attribute
 
+class IJobCreator(Interface):
+    """marker for pre-creation view of object"""
 
 class IJob(Interface):
     """Interface for the basic Job"""
@@ -29,7 +31,7 @@
                       "Current state of the job listing.\n"
                       "The possible values are defined in JobState.")
 
-    def approve(self):
+    def approve():
         "Moves the job state to approved"
 
 


=== Packages/JobBoardEx/JobEditView.pt 1.3 => 1.3.2.1 ===
     <tr><td>Submitter:</td>
 	<td><input name="submitter" type="text" value="" size="72"
-	           tal:attributes="value view/getSubmitter|default" />
+	           tal:attributes="value container/getSubmitter|default" />
 	</td>
     </tr>
     <tr><td>Summary:</td>
 	<td><input name="summary" type="text" value="" size="72"
-	           tal:attributes="value view/getSummary|default" />
+	           tal:attributes="value container/getSummary|default" />
 	</td>
     </tr>
     <tr><td>Description:</td>
 	<td><textarea cols=72 rows=20 name="description" type="text"
-	     ><span tal:replace="view/getDescription|nothing"
+	     ><span tal:replace="container/getDescription|nothing"
                    /></textarea>
 	</td>
     </tr>
     <tr><td>Contact:</td>
 	<td><input name="contact" type="text" value="" size="72"
-	           tal:attributes="value view/getContact|default" />
+	           tal:attributes="value container/getContact|default" />
 	</td>
     </tr>
     <tr><td colspan="2">


=== Packages/JobBoardEx/JobList.zcml 1.13 => 1.13.2.1 ===
 <!-- Job -->
 
-<!-- This doesn't need a factory, since jobs are always created by
+<!-- NO LONGER TRUE: This doesn't need a factory, since jobs are always
+created by
      Python code. -->
+<!-- ideally this would be a placeful factory, only to be within a
+JobList; that is not an option now, so "Job" will be available
+everywhere at the moment. Note the marker_interface is the only new
+animal here. -->
+
+<zmi:factoryFromClass
+	name=".Job."
+	permission_id="Zope.Public"
+	title="Job"
+        marker_interface=".IJob.IJobCreator." 
+/>
 
 <security:protectClass
 	name=".Job."
@@ -33,6 +45,20 @@
 
 
 <!-- *** Views *** -->
+
+<!-- pre-creation job view -->
+
+<browser:defaultView
+    for=".IJob.IJobCreator"
+    name="create"
+    factory=".JobView.CreateJobView"
+/>
+
+<security:protectClass
+        name=".JobView.CreateJobView"
+        permission_id="Zope.Public"
+        methods="index, action"
+/>
 
 <!-- JobListTraverser -->
 


=== Packages/JobBoardEx/JobListView.pt 1.4 => 1.4.2.1 ===
 <h1>Job Board</h1>
 
-<A href="../new">Submit a new job</A>
+<A href="../.Job.;create">Submit a new job</A>
 
 <H2>Job Listings</H2>
 
 <table>
 
-<tr tal:repeat="job view/getApprovedJobs">
+<tr tal:repeat="job container/getApprovedJobs">
     <td>
     <a href="jobid" tal:attributes="href string:../${job/id}">
     <span tal:replace="job/summary">A job summary</span></A>


=== Packages/JobBoardEx/JobView.pt 1.6 => 1.6.2.1 ===
 	<table border=0>
 	<tr><td>Submitter:</td>
-	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+	    <td tal:content="container/getSubmitter">aperson@dom.ain</td>
 	</tr>
 	<tr><td>Summary:</td>
-	    <td tal:content="view/getSummary">The best job on the net</td>
+	    <td tal:content="container/getSummary">The best job on the net</td>
 	</tr>
 	<tr><td>Description:</td>
-	    <td tal:content="view/getDescription">This is really really
+	    <td tal:content="container/getDescription">This is really really
 		    really the best job on the Internet</td>
 	</tr>
 	<tr><td>Contact:</td>
-	    <td tal:content="view/getContact">bperson@dom.ain</td>
+	    <td tal:content="container/getContact">bperson@dom.ain</td>
 	</tr>
 	</table>
 


=== Packages/JobBoardEx/JobView.py 1.8 => 1.8.2.1 ===
 from Zope.Publisher.Browser.AttributePublisher import AttributePublisher
+from Zope.ContextWrapper import getcontext
+from Zope.App.OFS.Container.Exceptions import DuplicateIDError
+from Zope.ComponentArchitecture import createObject
+from IJobList import IJobList
 
-from IJob import IJob, JobState
+from IJob import IJob, JobState, IJobCreator
 
 
 class JobView(AttributePublisher):
@@ -47,3 +51,42 @@
         job = self.job
         joblist.add(job)
         return REQUEST.getResponse().redirect('..')
+
+class CreateJobView(AttributePublisher):
+    """Provide an interface for adding a job
+    """
+
+    def __init__(self, context):
+        self._context=context
+        if not IJobList.isImplementedBy(getcontext(context)):
+            raise StandardError, "Job objects can only be created within a JobList"
+        # StandardError is not a good choice but I don't even know
+        # if this solution will be approved yet so I am not worrying
+        # about it
+
+    def getContext(self):
+        return self._context
+
+    # Assert that we can only be applied to IJobCreator
+    __used_for__=IJobCreator
+
+    # Input form
+    index = PageTemplateFile('JobCreateView.pt', globals())
+
+    # action method
+    def action(self, submitter, summary, description, contact, REQUEST=None):
+        """Create an item of the class identified by the Addable (held in
+        _context) within the container that is the parent of the Addable"""
+        addable=self.getContext()
+        container=getcontext(addable)
+
+        container.add(createObject(container, addable.id(), submitter, summary, description, contact ))
+
+        if REQUEST is not None:
+            # for unit tests
+            REQUEST.getResponse().redirect(REQUEST.URL[-3])
+
+        return self.confirmed( type_name=addable.id(), id=id )
+
+    confirmed = PageTemplateFile('add_confirmed.pt')
+    
\ No newline at end of file



From garyposter@earthlink.net  Wed Apr  3 02:46:08 2002
From: garyposter@earthlink.net (Gary Poster)
Date: Tue, 2 Apr 2002 21:46:08 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - ApproveJobs.pt:1.5.2.2 JobEditView.pt:1.3.2.2 JobList.zcml:1.13.2.2 JobListView.pt:1.4.2.2 JobPreviewView.pt:1.3.2.1 JobView.pt:1.6.2.2
Message-ID: <200204030246.g332k8W05955@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv5618

Modified Files:
      Tag: gary-pre_create_views_example-branch
	ApproveJobs.pt JobEditView.pt JobList.zcml JobListView.pt 
	JobPreviewView.pt JobView.pt 
Log Message:
changed pts back to view/context of SteveA, and changed zcml to new syntax of Stephan's



=== Packages/JobBoardEx/ApproveJobs.pt 1.5.2.1 => 1.5.2.2 ===
 <body>
 
-    <form action="" method="post">
+    <form action="." method="post">
     <table border=0>
     <tr><th colspan=3>Action</th>
-	<th rowspan=2>Summary</th>
+        <th rowspan=2>Summary</th>
     </tr>
     <tr><th>Defer</th><th>Approve</th><th>Discard</th>
     </tr>
-    <tr tal:repeat="job container/getPendingJobs"
-	style="text-align:center">
-	<td><input name="job_N" type="radio" value="defer" checked
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td><input name="job_N" type="radio" value="approve"
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td><input name="job_N" type="radio" value="discard"
-		   tal:attributes="name string:job_${job/id}"></td>
-	<td tal:content="job/summary">The best job on the Internet</td>
+    <tr tal:repeat="job view/getPendingJobs"
+        style="text-align:center">
+        <td><input name="job_N" type="radio" value="defer" checked
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td><input name="job_N" type="radio" value="approve"
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td><input name="job_N" type="radio" value="discard"
+                   tal:attributes="name string:job_${job/id}"></td>
+        <td tal:content="job/summary">The best job on the Internet</td>
     </tr>
     <tr><td colspan="3">
-	<input name="submit:method" type="submit" value="Submit">
-	<input name="back:method" type="submit" value="Back to summary">
+        <input name="submit:method" type="submit" value="Submit">
+        <input name="back:method" type="submit" value="Back to summary">
     </td></tr>
     </table>
     </form>
-	    
+            
 </body>
 </html>


=== Packages/JobBoardEx/JobEditView.pt 1.3.2.1 => 1.3.2.2 ===
 <body>
 <h1>Enter new job data</h1>
-    <form action="" method="post">
+    <form action="." method="post">
     <table border=0>
     <tr><td>Submitter:</td>
-	<td><input name="submitter" type="text" value="" size="72"
-	           tal:attributes="value container/getSubmitter|default" />
-	</td>
+        <td><input name="submitter" type="text" value="" size="72"
+                   tal:attributes="value view/getSubmitter|default" />
+        </td>
     </tr>
     <tr><td>Summary:</td>
-	<td><input name="summary" type="text" value="" size="72"
-	           tal:attributes="value container/getSummary|default" />
-	</td>
+        <td><input name="summary" type="text" value="" size="72"
+                   tal:attributes="value view/getSummary|default" />
+        </td>
     </tr>
     <tr><td>Description:</td>
-	<td><textarea cols=72 rows=20 name="description" type="text"
-	     ><span tal:replace="container/getDescription|nothing"
+        <td><textarea cols=72 rows=20 name="description" type="text"
+             ><span tal:replace="view/getDescription|nothing"
                    /></textarea>
-	</td>
+        </td>
     </tr>
     <tr><td>Contact:</td>
-	<td><input name="contact" type="text" value="" size="72"
-	           tal:attributes="value container/getContact|default" />
-	</td>
+        <td><input name="contact" type="text" value="" size="72"
+                   tal:attributes="value view/getContact|default" />
+        </td>
     </tr>
     <tr><td colspan="2">
-	<input name="preview:method" type="submit" value="Preview">
-	<input name="cancel:method" type="submit" value="Cancel">
-	<input name="reset" type="reset" value="Reset">
-	</td>
+        <input name="preview:method" type="submit" value="Preview">
+        <input name="cancel:method" type="submit" value="Cancel">
+        <input name="reset" type="reset" value="Reset">
+        </td>
     </tr>
     </table>
     </form>    


=== Packages/JobBoardEx/JobList.zcml 1.13.2.1 => 1.13.2.2 ===
 
 <!-- JobList -->
-
-<zmi:factoryFromClass
-         name=".JobList."
-         permission_id="Zope.Public"
-         title="JobList"
-/>
+<zmi:factoryFromClass name="JobList"
+                      class=".JobList."
+                      permission_id="Zope.ManageContent"
+                      title="JobList"
+                      description="A Job Board" />
 
 <security:protectClass
          name=".JobList."
@@ -23,18 +22,16 @@
 
 <!-- Job -->
 
-<!-- NO LONGER TRUE: This doesn't need a factory, since jobs are always
-created by
-     Python code. -->
-<!-- ideally this would be a placeful factory, only to be within a
-JobList; that is not an option now, so "Job" will be available
-everywhere at the moment. Note the marker_interface is the only new
-animal here. -->
+<!-- ideally jobs would be created within a placeful factory, only to
+be within a JobList; that is not an option now, so "Job" will be
+available everywhere at the moment. Note the marker_interface is the
+only new animal here. -->
 
 <zmi:factoryFromClass
-	name=".Job."
+	name="Job"
+	class=".Job."
 	permission_id="Zope.Public"
-	title="Job"
+	title="A job to be placed within a JobList"
         marker_interface=".IJob.IJobCreator." 
 />
 


=== Packages/JobBoardEx/JobListView.pt 1.4.2.1 => 1.4.2.2 ===
 <h1>Job Board</h1>
 
-<A href="../.Job.;create">Submit a new job</A>
+<A href="../Job;create">Submit a new job</A>
 
 <H2>Job Listings</H2>
 
 <table>
 
-<tr tal:repeat="job container/getApprovedJobs">
+<tr tal:repeat="job view/getApprovedJobs">
     <td>
     <a href="jobid" tal:attributes="href string:../${job/id}">
     <span tal:replace="job/summary">A job summary</span></A>


=== Packages/JobBoardEx/JobPreviewView.pt 1.3 => 1.3.2.1 ===
 <body>
 
-    <form action="" method="post">
+    <form action="." method="post">
 
-	<table border=0>
-	<tr><td>Submitter:</td>
-	    <td tal:content="view/getSubmitter">aperson@dom.ain</td>
-	</tr>
-	<tr><td>Summary:</td>
-	    <td tal:content="view/getSummary">The best job on the net</td>
-	</tr>
-	<tr><td>Description:</td>
-	    <td tal:content="view/getDescription">This is really really
-		    really the best job on the Internet</td>
-	</tr>
-	<tr><td>Contact:</td>
-	    <td tal:content="view/getContact">bperson@dom.ain</td>
-	</tr>
-	</table>
+        <table border=0>
+        <tr><td>Submitter:</td>
+            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+        </tr>
+        <tr><td>Summary:</td>
+            <td tal:content="view/getSummary">The best job on the net</td>
+        </tr>
+        <tr><td>Description:</td>
+            <td tal:content="view/getDescription">This is really really
+                    really the best job on the Internet</td>
+        </tr>
+        <tr><td>Contact:</td>
+            <td tal:content="view/getContact">bperson@dom.ain</td>
+        </tr>
+        </table>
 
     <table border=0>
-	<tr><td>
-	<input name="submit:method" type="submit" value="Submit">
-	<input name="edit:method" type="submit" value="Edit">
-	<input name="cancel:method" type="submit" value="Cancel">
-	</td></tr>
+        <tr><td>
+        <input name="submit:method" type="submit" value="Submit">
+        <input name="edit:method" type="submit" value="Edit">
+        <input name="cancel:method" type="submit" value="Cancel">
+        </td></tr>
     </table>
-	<input name="submitter" type="hidden" value="Submitter" size="72"
-	           tal:attributes="value view/getSubmitter" />
-	<input name="summary" type="hidden" value="Summary" size="72"
-	           tal:attributes="value view/getSummary" />
-	<input name="description" type="hidden" value=""
-	           tal:attributes="value view/getDescription" />
-	<input name="contact" type="hidden" value="" size="72"
-	           tal:attributes="value view/getContact" />
+        <input name="submitter" type="hidden" value="Submitter" size="72"
+                   tal:attributes="value view/getSubmitter" />
+        <input name="summary" type="hidden" value="Summary" size="72"
+                   tal:attributes="value view/getSummary" />
+        <input name="description" type="hidden" value=""
+                   tal:attributes="value view/getDescription" />
+        <input name="contact" type="hidden" value="" size="72"
+                   tal:attributes="value view/getContact" />
     </form>    
 
 </body>


=== Packages/JobBoardEx/JobView.pt 1.6.2.1 => 1.6.2.2 ===
     <form action=".." method="get">
 
-	<table border=0>
-	<tr><td>Submitter:</td>
-	    <td tal:content="container/getSubmitter">aperson@dom.ain</td>
-	</tr>
-	<tr><td>Summary:</td>
-	    <td tal:content="container/getSummary">The best job on the net</td>
-	</tr>
-	<tr><td>Description:</td>
-	    <td tal:content="container/getDescription">This is really really
-		    really the best job on the Internet</td>
-	</tr>
-	<tr><td>Contact:</td>
-	    <td tal:content="container/getContact">bperson@dom.ain</td>
-	</tr>
-	</table>
+        <table border=0>
+        <tr><td>Submitter:</td>
+            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+        </tr>
+        <tr><td>Summary:</td>
+            <td tal:content="view/getSummary">The best job on the net</td>
+        </tr>
+        <tr><td>Description:</td>
+            <td tal:content="view/getDescription">This is really really
+                    really the best job on the Internet</td>
+        </tr>
+        <tr><td>Contact:</td>
+            <td tal:content="view/getContact">bperson@dom.ain</td>
+        </tr>
+        </table>
 
     <table border=0>
-	<tr><td>
-	<input type="submit" value="Back to summary">
-	</td></tr>
+        <tr><td>
+        <input type="submit" value="Back to summary">
+        </td></tr>
     </table>
     </form>    
 



From garyposter@earthlink.net  Wed Apr  3 18:59:00 2002
From: garyposter@earthlink.net (Gary Poster)
Date: Wed, 3 Apr 2002 13:59:00 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - ApproveJobs.pt:1.5.2.3 ApproveJobs.py:1.6.2.1 JobCreateView.pt:1.1.2.2 JobList.zcml:1.13.2.3 JobPreviewView.pt:1.3.2.2 JobView.py:1.8.2.2
Message-ID: <200204031859.g33Ix0824426@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv24356

Modified Files:
      Tag: gary-pre_create_views_example-branch
	ApproveJobs.pt ApproveJobs.py JobCreateView.pt JobList.zcml 
	JobPreviewView.pt JobView.py 
Log Message:
added preview, fixed a few things: in particular, used absolute URLs for form actions, rather than all the implicit stuff (that was not working for me)



=== Packages/JobBoardEx/ApproveJobs.pt 1.5.2.2 => 1.5.2.3 ===
 <body>
 
-    <form action="." method="post">
+    <form action="." method="post" tal:attributes="action request/URL/-1">
     <table border=0>
     <tr><th colspan=3>Action</th>
         <th rowspan=2>Summary</th>


=== Packages/JobBoardEx/ApproveJobs.py 1.6 => 1.6.2.1 ===
 
     def back(self, REQUEST):
-        return REQUEST.getResponse().redirect('..')
+        return REQUEST.getResponse().redirect(REQUEST.URL[-2])
 
     def submit(self, REQUEST):
         """Approve a job."""


=== Packages/JobBoardEx/JobCreateView.pt 1.1.2.1 => 1.1.2.2 ===
 <body>
 <h1>Enter new job data</h1>
-    <form action="action" method="post">
+    <form action="." method="post" tal:attributes="action request/URL/-1">
     <table border=0>
     <tr><td>Submitter:</td>
-	<td><input name="submitter" type="text" value="" size="72"
+	<td><input name="submitter" type="text" value="" size="72" 
+	tal:attributes="value request/submitter|default"
 	            />
 	</td>
     </tr>
     <tr><td>Summary:</td>
 	<td><input name="summary" type="text" value="" size="72"
+	tal:attributes="value request/summary|default"
 	            />
 	</td>
     </tr>
     <tr><td>Description:</td>
 	<td><textarea cols=72 rows=20 name="description" type="text"
+	tal:content="request/description|default"
 	     ></textarea>
 	</td>
     </tr>
     <tr><td>Contact:</td>
 	<td><input name="contact" type="text" value="" size="72"
+	tal:attributes="value request/contact|default"
 	           />
 	</td>
     </tr>
     <tr><td colspan="2">
-	<!-- input name="preview:method" type="submit" value="Preview" -->
-	<input name="submit" type="submit" value="Create">
+	<input name="preview:method" type="submit" value="Preview">
+	<input name="action:method" type="submit" value="Create">
 	<input name="reset" type="reset" value="Reset">
 	</td>
     </tr>


=== Packages/JobBoardEx/JobList.zcml 1.13.2.2 => 1.13.2.3 ===
         name=".JobView.CreateJobView"
         permission_id="Zope.Public"
-        methods="index, action"
+        methods="index, action, preview"
 />
 
 <!-- JobListTraverser -->


=== Packages/JobBoardEx/JobPreviewView.pt 1.3.2.1 => 1.3.2.2 ===
-<head></head>
+<head>
+<title>Preview job data</title></head>
 <body>
 
-    <form action="." method="post">
+    <form action="." method="post" tal:attributes="action
+    request/URL/-1">
 
         <table border=0>
         <tr><td>Submitter:</td>
-            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+            <td tal:content="request/submitter">aperson@dom.ain</td>
         </tr>
         <tr><td>Summary:</td>
-            <td tal:content="view/getSummary">The best job on the net</td>
+            <td tal:content="request/summary">The best job on the net</td>
         </tr>
         <tr><td>Description:</td>
-            <td tal:content="view/getDescription">This is really really
+            <td tal:content="request/description">This is really really
                     really the best job on the Internet</td>
         </tr>
         <tr><td>Contact:</td>
-            <td tal:content="view/getContact">bperson@dom.ain</td>
+            <td tal:content="request/contact">bperson@dom.ain</td>
         </tr>
         </table>
 
     <table border=0>
         <tr><td>
-        <input name="submit:method" type="submit" value="Submit">
-        <input name="edit:method" type="submit" value="Edit">
+        <input name="action:method" type="submit" value="Submit">
+        <input name="index:method" type="submit" value="Edit">
         <input name="cancel:method" type="submit" value="Cancel">
         </td></tr>
     </table>
         <input name="submitter" type="hidden" value="Submitter" size="72"
-                   tal:attributes="value view/getSubmitter" />
+                   tal:attributes="value request/submitter" />
         <input name="summary" type="hidden" value="Summary" size="72"
-                   tal:attributes="value view/getSummary" />
+                   tal:attributes="value request/summary" />
         <input name="description" type="hidden" value=""
-                   tal:attributes="value view/getDescription" />
+                   tal:attributes="value request/description" />
         <input name="contact" type="hidden" value="" size="72"
-                   tal:attributes="value view/getContact" />
+                   tal:attributes="value request/contact" />
     </form>    
 
 </body>


=== Packages/JobBoardEx/JobView.py 1.8.2.1 => 1.8.2.2 ===
 
     confirmed = PageTemplateFile('add_confirmed.pt')
-    
\ No newline at end of file
+    preview = PageTemplateFile('JobPreviewView.pt')
+    def _preview(self, submitter, summary, description, contact, REQUEST=None):
+        """Preview the job"""
+	self._submitter=submitter
+	self._summary=summary
+	self._description=description
+	self._contact=contact
+
+    




From garyposter@earthlink.net  Thu Apr  4 04:32:02 2002
From: garyposter@earthlink.net (Gary Poster)
Date: Wed, 3 Apr 2002 23:32:02 -0500
Subject: [Zope-CVS] CVS: Packages/JobBoardEx - JobCreateView.pt:1.2 add_confirmed.pt:1.2 ApproveJobs.pt:1.7 ApproveJobs.py:1.7 IJob.py:1.7 JobList.zcml:1.14 JobListView.pt:1.5 JobPreviewView.pt:1.5 JobView.py:1.9
Message-ID: <200204040432.g344W2124502@cvs.baymountain.com>

Update of /cvs-repository/Packages/JobBoardEx
In directory cvs.zope.org:/tmp/cvs-serv24323

Modified Files:
	ApproveJobs.pt ApproveJobs.py IJob.py JobList.zcml 
	JobListView.pt JobPreviewView.pt JobView.py 
Added Files:
	JobCreateView.pt add_confirmed.pt 
Log Message:
added pre-create view code, incorporated Stephan's zcml changes



=== Packages/JobBoardEx/JobCreateView.pt 1.1 => 1.2 ===
+<head>
+<title>Enter new job data</title>
+</head>
+<body>
+<h1>Enter new job data</h1>
+    <form action="." method="post" tal:attributes="action request/URL/-1">
+    <table border=0>
+    <tr><td>Submitter:</td>
+	<td><input name="submitter" type="text" value="" size="72" 
+	tal:attributes="value request/submitter|default"
+	            />
+	</td>
+    </tr>
+    <tr><td>Summary:</td>
+	<td><input name="summary" type="text" value="" size="72"
+	tal:attributes="value request/summary|default"
+	            />
+	</td>
+    </tr>
+    <tr><td>Description:</td>
+	<td><textarea cols=72 rows=20 name="description" type="text"
+	tal:content="request/description|default"
+	     ></textarea>
+	</td>
+    </tr>
+    <tr><td>Contact:</td>
+	<td><input name="contact" type="text" value="" size="72"
+	tal:attributes="value request/contact|default"
+	           />
+	</td>
+    </tr>
+    <tr><td colspan="2">
+	<input name="preview:method" type="submit" value="Preview">
+	<input name="action:method" type="submit" value="Create">
+	<input name="reset" type="reset" value="Reset">
+	</td>
+    </tr>
+    </table>
+    </form>    
+
+</body>
+</html>


=== Packages/JobBoardEx/add_confirmed.pt 1.1 => 1.2 ===
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+      metal:use-macro="presentation/standard_macros/html">
+  -->
+<body>
+
+<p> Object added successfully. </p>
+
+</body>
+</html>


=== Packages/JobBoardEx/ApproveJobs.pt 1.6 => 1.7 ===
 <body>
 
-    <form action="." method="post">
+
+    <form action="." method="post" tal:attributes="action request/URL/-1">
     <table border=0>
     <tr><th colspan=3>Action</th>
         <th rowspan=2>Summary</th>


=== Packages/JobBoardEx/ApproveJobs.py 1.6 => 1.7 ===
 
     def back(self, REQUEST):
-        return REQUEST.getResponse().redirect('..')
+        return REQUEST.getResponse().redirect(REQUEST.URL[-2])
 
     def submit(self, REQUEST):
         """Approve a job."""


=== Packages/JobBoardEx/IJob.py 1.6 => 1.7 ===
 from Interface.Attribute import Attribute
 
+class IJobCreator(Interface):
+    """marker for pre-creation view of object"""
 
 class IJob(Interface):
     """Interface for the basic Job"""
@@ -29,7 +31,7 @@
                       "Current state of the job listing.\n"
                       "The possible values are defined in JobState.")
 
-    def approve(self):
+    def approve():
         "Moves the job state to approved"
 
 


=== Packages/JobBoardEx/JobList.zcml 1.13 => 1.14 ===
 
 <!-- JobList -->
-
-<zmi:factoryFromClass
-         name=".JobList."
-         permission_id="Zope.Public"
-         title="JobList"
-/>
+<zmi:factoryFromClass name="JobList"
+                      class=".JobList."
+                      permission_id="Zope.ManageContent"
+                      title="JobList"
+                      description="A Job Board" />
 
 <security:protectClass
          name=".JobList."
@@ -23,8 +22,18 @@
 
 <!-- Job -->
 
-<!-- This doesn't need a factory, since jobs are always created by
-     Python code. -->
+<!-- ideally jobs would be created within a placeful factory, only to
+be within a JobList; that is not an option now, so "Job" will be
+available everywhere at the moment. Note the marker_interface is the
+only new animal here. -->
+
+<zmi:factoryFromClass
+	name="Job"
+	class=".Job."
+	permission_id="Zope.Public"
+	title="A job to be placed within a JobList"
+        marker_interface=".IJob.IJobCreator." 
+/>
 
 <security:protectClass
 	name=".Job."
@@ -33,6 +42,20 @@
 
 
 <!-- *** Views *** -->
+
+<!-- pre-creation job view -->
+
+<browser:defaultView
+    for=".IJob.IJobCreator"
+    name="create"
+    factory=".JobView.CreateJobView"
+/>
+
+<security:protectClass
+        name=".JobView.CreateJobView"
+        permission_id="Zope.Public"
+        methods="index, action, preview, cancel"
+/>
 
 <!-- JobListTraverser -->
 


=== Packages/JobBoardEx/JobListView.pt 1.4 => 1.5 ===
 <h1>Job Board</h1>
 
-<A href="../new">Submit a new job</A>
+<A href="../Job;create">Submit a new job</A>
 
 <H2>Job Listings</H2>
 


=== Packages/JobBoardEx/JobPreviewView.pt 1.4 => 1.5 ===
-<head></head>
+<head>
+<title>Preview job data</title></head>
 <body>
 
-    <form action="." method="post">
+    <form action="." method="post" tal:attributes="action
+    request/URL/-1">
+
 
         <table border=0>
         <tr><td>Submitter:</td>
-            <td tal:content="view/getSubmitter">aperson@dom.ain</td>
+            <td tal:content="request/submitter">aperson@dom.ain</td>
         </tr>
         <tr><td>Summary:</td>
-            <td tal:content="view/getSummary">The best job on the net</td>
+            <td tal:content="request/summary">The best job on the net</td>
         </tr>
         <tr><td>Description:</td>
-            <td tal:content="view/getDescription">This is really really
+            <td tal:content="request/description">This is really really
                     really the best job on the Internet</td>
         </tr>
         <tr><td>Contact:</td>
-            <td tal:content="view/getContact">bperson@dom.ain</td>
+            <td tal:content="request/contact">bperson@dom.ain</td>
         </tr>
         </table>
 
     <table border=0>
         <tr><td>
-        <input name="submit:method" type="submit" value="Submit">
-        <input name="edit:method" type="submit" value="Edit">
+        <input name="action:method" type="submit" value="Submit">
+        <input name="index:method" type="submit" value="Edit">
         <input name="cancel:method" type="submit" value="Cancel">
         </td></tr>
     </table>
         <input name="submitter" type="hidden" value="Submitter" size="72"
-                   tal:attributes="value view/getSubmitter" />
+                   tal:attributes="value request/submitter" />
         <input name="summary" type="hidden" value="Summary" size="72"
-                   tal:attributes="value view/getSummary" />
+                   tal:attributes="value request/summary" />
         <input name="description" type="hidden" value=""
-                   tal:attributes="value view/getDescription" />
+                   tal:attributes="value request/description" />
         <input name="contact" type="hidden" value="" size="72"
-                   tal:attributes="value view/getContact" />
+                   tal:attributes="value request/contact" />
     </form>    
 
 </body>


=== Packages/JobBoardEx/JobView.py 1.8 => 1.9 ===
 from Zope.Publisher.Browser.AttributePublisher import AttributePublisher
+from Zope.ContextWrapper import getcontext
+from Zope.App.OFS.Container.Exceptions import DuplicateIDError
+from Zope.ComponentArchitecture import createObject
+from IJobList import IJobList
 
-from IJob import IJob, JobState
+from IJob import IJob, JobState, IJobCreator
 
 
 class JobView(AttributePublisher):
@@ -47,3 +51,49 @@
         job = self.job
         joblist.add(job)
         return REQUEST.getResponse().redirect('..')
+
+class CreateJobView(AttributePublisher):
+    """Provide an interface for adding a job
+    """
+
+    def __init__(self, context):
+        self._context=context
+        if not IJobList.isImplementedBy(getcontext(context)):
+            raise StandardError, "Job objects can only be created within a JobList"
+        # StandardError is not a good choice but I don't even know
+        # if this solution will be approved yet so I am not worrying
+        # about it
+
+    def getContext(self):
+        return self._context
+
+    # Assert that we can only be applied to IJobCreator
+    __used_for__=IJobCreator
+
+    # Input form
+    index = PageTemplateFile('JobCreateView.pt', globals())
+
+    # action method
+    def action(self, submitter, summary, description, contact, REQUEST=None):
+        """Create an item of the class identified by the Addable (held in
+        _context) within the container that is the parent of the Addable"""
+        addable=self.getContext()
+        container=getcontext(addable)
+
+        container.add(createObject(container, addable.id(), submitter, summary, description, contact ))
+
+        if REQUEST is not None:
+            # for unit tests
+            REQUEST.getResponse().redirect(REQUEST.URL[-3])
+
+        return self.confirmed( type_name=addable.id(), id=id )
+
+    confirmed = PageTemplateFile('add_confirmed.pt')
+    preview = PageTemplateFile('JobPreviewView.pt')
+    def cancel(self, REQUEST=None):
+        """Cancel the job creation (would be more easily done with a link,
+	but I'm trying to accomodate the current design)"""
+	if REQUEST is not None:
+            REQUEST.getResponse().redirect(REQUEST.URL[-3])
+
+    




From tseaver@zope.com  Fri Apr 12 20:00:50 2002
From: tseaver@zope.com (Tres Seaver)
Date: Fri, 12 Apr 2002 15:00:50 -0400
Subject: [Zope-CVS] CVS: Packages/FunctionalTests - CHANGES.txt:1.2 Framework.py:1.16
Message-ID: <200204121900.g3CJ0oI03358@cvs.baymountain.com>

Update of /cvs-repository/Packages/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv3347

Modified Files:
	CHANGES.txt Framework.py 
Log Message:
 - Add SleepRequest.

=== Packages/FunctionalTests/CHANGES.txt 1.1 => 1.2 ===
 
+    - Framework: added SleepRequest, to permit injection of "shim" time
+      between real requests.
+
   Release 0.2 -- 2002/03/14
 
     - FTRunner:  added parsing of arbitrary defaults from command-line


=== Packages/FunctionalTests/Framework.py 1.15 => 1.16 ===
         raise NotImplementedError
 
+class SleepRequest( RequestBase ):
+    """
+        "Spacer" request.
+    """
+    def __init__( self, name ):
+
+        self._name = name
+        self._expected_result = 1
+        self._sleep_time = 1.0       # second
+
+    #
+    #   Accessors
+    #
+    def getType( self ):
+        """
+            Return a type string identifying the kind of request
+            (ick!).
+        """
+        return 'SleepRequest'
+
+    def getName( self ):
+        """
+            Return the name of this request within the scenario.
+        """
+        return self._name
+
+    def getExpectedResult( self ):
+        """
+            Return the expected result (return value, HTTP request code,
+            etc.)
+        """
+        return self._expected_result
+
+    def getExpectedTime( self ):
+        """
+            Return the maximum expected time to complete the request.
+        """
+        return self._sleep_time
+
+    def getSleepTime( self ):
+        """
+            Return the time to sleep, in seconds.
+        """
+        return self._sleep_time
+
+    def setSleepTime( self, sleep_time ):
+        """
+            Set the sleep time, in seconds.
+        """
+        self._sleep_time = sleep_time
+
+    def __call__( self, result ):
+        """
+            Invoke the request, storing results in 'result'.
+        """
+        import time
+        time.sleep( self._sleep_time )
+
+def _buildSleepRequest( cp, section ):
+    """
+        Construct a SleepRequest, using the values in 'cp' and 'section'.
+    """
+    r = SleepRequest( section )
+
+    options = cp.options( section )
+
+    if 'sleep' in options:
+        r.setSleepTime( float( cp.get( section, 'sleep' ) ) )
+
+    return r
+
 
 HKEY    = re.compile( r'Header_[0-9]+', re.IGNORECASE )
 HEADER  = re.compile( r'([A-Za-z_][\w_]*)[ ]*=[ ]*(.*)' )
@@ -854,7 +925,9 @@
     """
         Construct a Request, using the values in 'cp' and 'section'.
     """
-    if 'url' in cp.options( section ):
+    if 'sleep' in cp.options( section ):
+        return _buildSleepRequest( cp, section )
+    elif 'url' in cp.options( section ):
         return _buildHTTPRequest( cp, section )
     else:
         return _buildZEORequest( cp, section )
@@ -1043,7 +1116,8 @@
 
             request, requests = requests[0], requests[1:]
             invocation = request( result )
-            result.addInvocation( invocation, request )
+            if invocation is not None:
+                result.addInvocation( invocation, request )
 
             if hasattr( invocation, 'getCookies' ):
                 cookies = invocation.getCookies()




From tseaver@zope.com  Fri Apr 12 23:16:44 2002
From: tseaver@zope.com (Tres Seaver)
Date: Fri, 12 Apr 2002 18:16:44 -0400
Subject: [Zope-CVS] CVS: Packages/FunctionalTests - FTRunner.py:1.6
Message-ID: <200204122216.g3CMGiE09542@cvs.baymountain.com>

Update of /cvs-repository/Packages/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv9532

Modified Files:
	FTRunner.py 
Log Message:
 - Use millis.

=== Packages/FunctionalTests/FTRunner.py 1.5 => 1.6 ===
                             ),  # note comma
 
-        print ' %0.2f' % invocation.getInterval()
+        print ' %0.3f' % invocation.getInterval()
 
 
     def printResult( self, result ):




From tseaver@zope.com  Sat Apr 13 00:01:51 2002
From: tseaver@zope.com (Tres Seaver)
Date: Fri, 12 Apr 2002 19:01:51 -0400
Subject: [Zope-CVS] CVS: Packages/FunctionalTests - Framework.py:1.17
Message-ID: <200204122301.g3CN1p400708@cvs.baymountain.com>

Update of /cvs-repository/Packages/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv30654

Modified Files:
	Framework.py 
Log Message:


  - Update Result to share cookies with parents (i.e., an entire suite
    shares a single session).

  - Add 'repeat' for both requests and sub-tests.
    
  The combination of 'repeat', SleepRequests, and shared cookies
  allows us to generate long-running, repetetive sequences of reqeusts,
  simulating reasonable "real-world" request patterns.


=== Packages/FunctionalTests/Framework.py 1.16 => 1.17 ===
         self._children = []
         self._cookies = []
+        self._parent = None
 
     #
     #   Queries
@@ -67,17 +68,37 @@
         result.update( self._defaults )
         return result
 
+    def getParent( self ):
+        """
+            Return our parent request, or None.
+        """
+        return self._parent
+
+    def setParent( self, parent ):
+        """
+            Setup our parent request.
+        """
+        self._parent = parent
+
     def getCookies( self ):
         """
             Return cookies we have accumulated during the request.
         """
-        return self._cookies
+        if self._cookies:
+            return self._cookies
+        #import pdb; pdb.set_trace()
+        if self._parent:
+            return self._parent.getCookies()
+        return []
 
     def setCookies( self, cookies ):
         """
             Store our cookies.
         """
         self._cookies = cookies
+        if self._parent:
+            #import pdb; pdb.set_trace()
+            self._parent.setCookies( cookies )
 
     def setStateValue( self, key, value ):
         """
@@ -174,6 +195,7 @@
                      , self.checkResponses()
                      , self.checkElapsedTimes()
                      )
+        child.setParent( self )
         self._children.append( child )
         return child
 
@@ -423,7 +445,7 @@
     options = cp.options( section )
 
     if 'sleep' in options:
-        r.setSleepTime( float( cp.get( section, 'sleep' ) ) )
+        r.setSleepTime( cp.getfloat( section, 'sleep' ) )
 
     return r
 
@@ -1092,9 +1114,10 @@
         """
         self._load_sequence = load_sequence
     
-    def addRequest( self, request ):
+    def addRequest( self, request, repeat_count=1 ):
 
-        return self._requests.append( request )
+        for i in range( repeat_count ):
+            self._requests.append( request )
 
     #
     #   TestBase interface
@@ -1144,10 +1167,11 @@
         """
         return tuple( self._children )
 
-    def addChild( self, child ):
+    def addChild( self, child, repeat_count=1 ):
         """
         """
-        self._children.append( child )
+        for i in range( repeat_count ):
+            self._children.append( child )
 
     def _execute( self, result ):
 
@@ -1212,10 +1236,16 @@
         test.setSetup( _buildRequest( cp, _SETUP_SECTION ) )
 
     for section in cp.listOtherSections():
+        options = cp.options( section )
+        if 'repeat' in options:
+            repeat_count = cp.getint( section, 'repeat' )
+        else:
+            repeat_count = 1
         if isScenario:
-            test.addRequest( _buildRequest( cp, section ) )
+            test.addRequest( _buildRequest( cp, section ), repeat_count )
         else:
-            test.addChild( buildTest( cp.get( section, 'file' ), defaults ) )
+            child = buildTest( cp.get( section, 'file' ), defaults )
+            test.addChild( child, repeat_count )
 
     if isScenario and _POSTCONDITION_SECTION in cp.listSpecialSections( 0 ):
         test.setPostcondition( _buildRequest( cp, _POSTCONDITION_SECTION ) )




From tseaver@zope.com  Sat Apr 13 00:03:42 2002
From: tseaver@zope.com (Tres Seaver)
Date: Fri, 12 Apr 2002 19:03:42 -0400
Subject: [Zope-CVS] CVS: Packages/FunctionalTests - CHANGES.txt:1.3
Message-ID: <200204122303.g3CN3g701170@cvs.baymountain.com>

Update of /cvs-repository/Packages/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv1160

Modified Files:
	CHANGES.txt 
Log Message:


=== Packages/FunctionalTests/CHANGES.txt 1.2 => 1.3 ===
 
+    - Framework: Modified Result to propagate cookies through entire
+      result tree.
+
+    - Framework: added 'repeat' directive for both requests and sub-tests.
+
     - Framework: added SleepRequest, to permit injection of "shim" time
       between real requests.
 




From shane@cvs.zope.org  Sun Apr 14 03:24:00 2002
From: shane@cvs.zope.org (Shane Hathaway)
Date: Sat, 13 Apr 2002 22:24:00 -0400
Subject: [Zope-CVS] CVS: Products/CookieCrumbler - CHANGES.txt:1.3 CookieCrumbler.py:1.5 version.txt:1.3
Message-ID: <200204140224.g3E2O0O22078@cvs.baymountain.com>

Update of /cvs-repository/Products/CookieCrumbler
In directory cvs.zope.org:/tmp/cvs-serv22068

Modified Files:
	CHANGES.txt CookieCrumbler.py version.txt 
Log Message:
- Cookie crumblers were causing an authentication error on logout.  Corrected.

- Cookie paths weren't being set correctly when local paths were turned
  on.  Actually, the enabling of local paths was reversed from what the
  checkbox label implied, doubling the confusion.


=== Products/CookieCrumbler/CHANGES.txt 1.2 => 1.3 ===
 
 - Merged WebDAV source port fix from CMFCore
+
+Version 0.5
+
+- Cookie crumblers were causing an authentication error on logout.  Corrected.
+
+- Cookie paths weren't being set correctly when local paths were turned
+  on.  Actually, the enabling of local paths was reversed from what the
+  checkbox label implied, doubling the confusion.


=== Products/CookieCrumbler/CookieCrumbler.py 1.4 => 1.5 ===
 
 import sys
-from base64 import encodestring
+from base64 import encodestring, decodestring
 from urllib import quote, unquote
 from os import path
 
@@ -164,11 +164,11 @@
 
     security.declarePublic('getCookiePath')
     def getCookiePath(self):
-        if self.local_cookie_path:
+        if not self.local_cookie_path:
             return '/'
         parent = aq_parent(aq_inner(self))
         if parent is not None:
-            return parent.absolute_url(1)
+            return '/' + parent.absolute_url(1)
         else:
             return '/'
 
@@ -229,11 +229,18 @@
             elif req.has_key(self.auth_cookie):
                 # Copy __ac to the auth header.
                 ac = unquote(req[self.auth_cookie])
-                req._auth = 'basic %s' % ac
-                req._cookie_auth = 1
-                resp._auth = 1
-                self.delRequestVar(req, self.auth_cookie)
-                return ATTEMPT_RESUME
+                if ac and ac != 'deleted':
+                    try:
+                        decodestring(ac)
+                    except:
+                        # Not a valid auth header.
+                        pass
+                    else:
+                        req._auth = 'basic %s' % ac
+                        req._cookie_auth = 1
+                        resp._auth = 1
+                        self.delRequestVar(req, self.auth_cookie)
+                        return ATTEMPT_RESUME
             return ATTEMPT_NONE
 
     def __call__(self, container, req):


=== Products/CookieCrumbler/version.txt 1.2 => 1.3 ===
+CookieCrumbler-0.5




From shane@cvs.zope.org  Sun Apr 14 03:47:45 2002
From: shane@cvs.zope.org (Shane Hathaway)
Date: Sat, 13 Apr 2002 22:47:45 -0400
Subject: [Zope-CVS] CVS: Products/CookieCrumbler - CHANGES.txt:1.4 CookieCrumbler.py:1.6
Message-ID: <200204140247.g3E2ljX28003@cvs.baymountain.com>

Update of /cvs-repository/Products/CookieCrumbler
In directory cvs.zope.org:/tmp/cvs-serv27994

Modified Files:
	CHANGES.txt CookieCrumbler.py 
Log Message:
Made sure inner cookie crumblers can override the logout form.


=== Products/CookieCrumbler/CHANGES.txt 1.3 => 1.4 ===
   on.  Actually, the enabling of local paths was reversed from what the
   checkbox label implied, doubling the confusion.
+
+- Made sure inner cookie crumblers can override the logout form.
+


=== Products/CookieCrumbler/CookieCrumbler.py 1.5 => 1.6 ===
                         self.delRequestVar(req, self.auth_cookie)
                         return ATTEMPT_RESUME
-            return ATTEMPT_NONE
+            if getattr(req, '_cookie_auth', 0):
+                # A higher cookie crumbler already did the work of
+                # moving the cookie to _auth, but the inner CC
+                # should have the opportunity to override logout forms, etc.
+                return ATTEMPT_RESUME
+            else:
+                return ATTEMPT_NONE
 
     def __call__(self, container, req):
         '''The __before_publishing_traverse__ hook.'''




From chrisw@nipltd.com  Mon Apr 15 16:26:51 2002
From: chrisw@nipltd.com (Chris Withers)
Date: Mon, 15 Apr 2002 11:26:51 -0400
Subject: [Zope-CVS] CVS: Packages/TestScripts - autotester.py:1.8
Message-ID: <200204151526.g3FFQpx17139@cvs.baymountain.com>

Update of /cvs-repository/Packages/TestScripts
In directory cvs.zope.org:/tmp/cvs-serv17131

Modified Files:
	autotester.py 
Log Message:
Added subject line change suggested by Steve A. Also left a handy print statement in for when people b0rk things.

=== Packages/TestScripts/autotester.py 1.7 => 1.8 ===
 from StringIO import StringIO
 from threading import Thread
+from re import compile
 
 class NonBlockingReader(Thread):
 
@@ -100,7 +101,7 @@
         # change dir to the right place
         chdir(join(sandbox,location))
         # do the checkout
-        system(config['cvs'][0]['command'][0]()+" -z6 export -r "+tag+" -d "+name+" "+module)
+        system(config['cvs'][0]['command'][0]()+" -z9 export -r "+tag+" -d "+name+" "+module)
 
     # get the python command
     p = config['python'][0][scenario['python'][0]()][0]()
@@ -116,6 +117,7 @@
     
     # execute the build command
     build_result = xml_execute(scenario['build'],p)
+    print build_result
         
     # run the tests
     test_result = xml_execute(scenario['test'],p)
@@ -149,11 +151,19 @@
     body.write('\n')
 
 # send the mail
+failed_re = compile('OVERALL FAILED \(total failures=(?P<failed>\d+)(?:, total errors=(?P<errored>\d+))?')
 email = config['email'][0]
-for address,body in emails.items():
+for address,body in emails.items():    
+    subject = email['subject'][0]()
+    content = body.getvalue()
+    m = failed_re.search(content)
+    if m:
+        for key,value in m.groupdict().items():
+            if value:
+                subject += ', %s %s' % (value,key)
     send(address,
-         email['subject'][0](),
-         body.getvalue(),
+         subject,
+         content,
          smtp_server=email['smtp'][0](),
          from_address=email['from'][0]())
     body.close()




From andreas@digicool.com  Wed Apr 17 14:02:46 2002
From: andreas@digicool.com (Andreas Jung)
Date: Wed, 17 Apr 2002 09:02:46 -0400
Subject: [Zope-CVS] CVS: Packages/WebDAVLogger - __init__.py:1.9
Message-ID: <200204171302.g3HD2kO03881@cvs.baymountain.com>

Update of /cvs-repository/Packages/WebDAVLogger
In directory cvs.zope.org:/tmp/cvs-serv3018

Modified Files:
	__init__.py 
Log Message:
downloading files using GET failed because
the WebDAVLogger wasn't aware how to handle file_part_producer
and file_close_producer instances



=== Packages/WebDAVLogger/__init__.py 1.8 => 1.9 ===
 from ZServer.PubCore.ZEvent import Wakeup 
 import thread,re,os,time
+from types import StringType
 from zLOG import LOG,INFO
 
 # Path to logfile
@@ -29,7 +30,11 @@
 def _log(text,what=''):
     global ts
 
-    if not pat.search(text): return 
+
+    if not isinstance(text,StringType): 
+        text = '...binary data ....' 
+    else:
+        if not pat.search(text): return 
 
     lock.acquire()
 




From andreas@digicool.com  Wed Apr 17 14:03:46 2002
From: andreas@digicool.com (Andreas Jung)
Date: Wed, 17 Apr 2002 09:03:46 -0400
Subject: [Zope-CVS] CVS: Packages/WebDAVLogger - CHANGES.txt:1.4
Message-ID: <200204171303.g3HD3kU03980@cvs.baymountain.com>

Update of /cvs-repository/Packages/WebDAVLogger
In directory cvs.zope.org:/tmp/cvs-serv3970

Modified Files:
	CHANGES.txt 
Log Message:
fixed broken behaviour when downloading File objects


=== Packages/WebDAVLogger/CHANGES.txt 1.3 => 1.4 ===
 
+  Version 0.XX:
+
+    - fixed broken behaviour when downloading File objects
+
   Version 0.2: 
+
     - request time logging
+
     - minor code cleanup
+
     - logfile is now written to <ZOPE_INST>/var/webdav_debug.log
 
   Version 0.1:   The beginning




From srichter@cbu.edu  Thu Apr 18 03:33:12 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:33:12 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop Packages/MoZTop - New directory
Message-ID: <200204180233.g3I2XCn17263@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop
In directory cvs.zope.org:/tmp/cvs-serv17256/MoZTop

Log Message:
Directory /cvs-repository/Packages/MoZTop added to the repository

=== Added directory Packages/MoZTop ===




From srichter@cbu.edu  Thu Apr 18 03:51:23 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:51:23 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna Packages/MoZTop/laguna - New directory
Message-ID: <200204180251.g3I2pNn22322@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna
In directory cvs.zope.org:/tmp/cvs-serv22305/laguna

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna added to the repository

=== Added directory Packages/MoZTop/laguna ===




From srichter@cbu.edu  Thu Apr 18 03:51:23 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:51:23 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/locale Packages/MoZTop/locale - New directory
Message-ID: <200204180251.g3I2pNs22324@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/locale
In directory cvs.zope.org:/tmp/cvs-serv22305/locale

Log Message:
Directory /cvs-repository/Packages/MoZTop/locale added to the repository

=== Added directory Packages/MoZTop/locale ===




From srichter@cbu.edu  Thu Apr 18 03:51:23 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:51:23 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content Packages/MoZTop/content - New directory
Message-ID: <200204180251.g3I2pNO22317@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content
In directory cvs.zope.org:/tmp/cvs-serv22305/content

Log Message:
Directory /cvs-repository/Packages/MoZTop/content added to the repository

=== Added directory Packages/MoZTop/content ===




From srichter@cbu.edu  Thu Apr 18 03:52:20 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:52:20 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/content Packages/MoZTop/laguna/content - New directory
Message-ID: <200204180252.g3I2qKj22441@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/content
In directory cvs.zope.org:/tmp/cvs-serv22429/content

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/content added to the repository

=== Added directory Packages/MoZTop/laguna/content ===




From srichter@cbu.edu  Thu Apr 18 03:52:20 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:52:20 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/skin Packages/MoZTop/laguna/skin - New directory
Message-ID: <200204180252.g3I2qK422448@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/skin
In directory cvs.zope.org:/tmp/cvs-serv22429/skin

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/skin added to the repository

=== Added directory Packages/MoZTop/laguna/skin ===




From srichter@cbu.edu  Thu Apr 18 03:52:20 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Wed, 17 Apr 2002 22:52:20 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/locale Packages/MoZTop/laguna/locale - New directory
Message-ID: <200204180252.g3I2qKB22447@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/locale
In directory cvs.zope.org:/tmp/cvs-serv22429/locale

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/locale added to the repository

=== Added directory Packages/MoZTop/laguna/locale ===




From srichter@cbu.edu  Thu Apr 18 05:46:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:46:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/content/laguna Packages/MoZTop/laguna/content/laguna - New directory
Message-ID: <200204180446.g3I4kqb18830@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/content/laguna
In directory cvs.zope.org:/tmp/cvs-serv18823/laguna

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/content/laguna added to the repository

=== Added directory Packages/MoZTop/laguna/content/laguna ===




From srichter@cbu.edu  Thu Apr 18 05:47:12 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:47:12 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop Packages/MoZTop/content/zopetop - New directory
Message-ID: <200204180447.g3I4lCF18916@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop
In directory cvs.zope.org:/tmp/cvs-serv18909/zopetop

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop added to the repository

=== Added directory Packages/MoZTop/content/zopetop ===




From srichter@cbu.edu  Thu Apr 18 05:48:51 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:51 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects Packages/MoZTop/content/zopetop/ContentObjects - New directory
Message-ID: <200204180448.g3I4mpt19131@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects
In directory cvs.zope.org:/tmp/cvs-serv19116/ContentObjects

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects ===




From srichter@cbu.edu  Thu Apr 18 05:48:51 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:51 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Data Packages/MoZTop/content/zopetop/Data - New directory
Message-ID: <200204180448.g3I4mpp19138@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Data
In directory cvs.zope.org:/tmp/cvs-serv19116/Data

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/Data added to the repository

=== Added directory Packages/MoZTop/content/zopetop/Data ===




From srichter@cbu.edu  Thu Apr 18 05:48:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Inspector Packages/MoZTop/content/zopetop/Inspector - New directory
Message-ID: <200204180448.g3I4mqa19144@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Inspector
In directory cvs.zope.org:/tmp/cvs-serv19116/Inspector

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/Inspector added to the repository

=== Added directory Packages/MoZTop/content/zopetop/Inspector ===




From srichter@cbu.edu  Thu Apr 18 05:48:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Main Packages/MoZTop/content/zopetop/Main - New directory
Message-ID: <200204180448.g3I4mq019150@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Main
In directory cvs.zope.org:/tmp/cvs-serv19116/Main

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/Main added to the repository

=== Added directory Packages/MoZTop/content/zopetop/Main ===




From srichter@cbu.edu  Thu Apr 18 05:48:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Menu Packages/MoZTop/content/zopetop/Menu - New directory
Message-ID: <200204180448.g3I4mqm19154@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Menu
In directory cvs.zope.org:/tmp/cvs-serv19116/Menu

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/Menu added to the repository

=== Added directory Packages/MoZTop/content/zopetop/Menu ===




From srichter@cbu.edu  Thu Apr 18 05:48:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:48:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/StatusBar Packages/MoZTop/content/zopetop/StatusBar - New directory
Message-ID: <200204180448.g3I4mqA19156@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/StatusBar
In directory cvs.zope.org:/tmp/cvs-serv19116/StatusBar

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/StatusBar added to the repository

=== Added directory Packages/MoZTop/content/zopetop/StatusBar ===




From srichter@cbu.edu  Thu Apr 18 05:49:17 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:17 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/locale/en-US Packages/MoZTop/laguna/locale/en-US - New directory
Message-ID: <200204180449.g3I4nHN19259@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/locale/en-US
In directory cvs.zope.org:/tmp/cvs-serv19237/en-US

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/locale/en-US added to the repository

=== Added directory Packages/MoZTop/laguna/locale/en-US ===




From srichter@cbu.edu  Thu Apr 18 05:49:39 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:39 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/File Packages/MoZTop/content/zopetop/ContentObjects/File - New directory
Message-ID: <200204180449.g3I4nda19304@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/File
In directory cvs.zope.org:/tmp/cvs-serv19290/File

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/File added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects/File ===




From srichter@cbu.edu  Thu Apr 18 05:49:39 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:39 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/Folder Packages/MoZTop/content/zopetop/ContentObjects/Folder - New directory
Message-ID: <200204180449.g3I4ndt19310@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/Folder
In directory cvs.zope.org:/tmp/cvs-serv19290/Folder

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/Folder added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects/Folder ===




From srichter@cbu.edu  Thu Apr 18 05:49:40 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:40 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/Image Packages/MoZTop/content/zopetop/ContentObjects/Image - New directory
Message-ID: <200204180449.g3I4neu19315@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/Image
In directory cvs.zope.org:/tmp/cvs-serv19290/Image

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/Image added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects/Image ===




From srichter@cbu.edu  Thu Apr 18 05:49:40 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:40 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/LoadedFolder Packages/MoZTop/content/zopetop/ContentObjects/LoadedFolder - New directory
Message-ID: <200204180449.g3I4nec19317@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/LoadedFolder
In directory cvs.zope.org:/tmp/cvs-serv19290/LoadedFolder

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/LoadedFolder added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects/LoadedFolder ===




From srichter@cbu.edu  Thu Apr 18 05:49:40 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:40 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/ZPTPage Packages/MoZTop/content/zopetop/ContentObjects/ZPTPage - New directory
Message-ID: <200204180449.g3I4net19322@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/ZPTPage
In directory cvs.zope.org:/tmp/cvs-serv19290/ZPTPage

Log Message:
Directory /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/ZPTPage added to the repository

=== Added directory Packages/MoZTop/content/zopetop/ContentObjects/ZPTPage ===




From srichter@cbu.edu  Thu Apr 18 05:49:49 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:49:49 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/locale/en-US/laguna Packages/MoZTop/laguna/locale/en-US/laguna - New directory
Message-ID: <200204180449.g3I4nns19331@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/locale/en-US/laguna
In directory cvs.zope.org:/tmp/cvs-serv19324/laguna

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/locale/en-US/laguna added to the repository

=== Added directory Packages/MoZTop/laguna/locale/en-US/laguna ===




From srichter@cbu.edu  Thu Apr 18 05:51:52 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:51:52 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/skin/laguna Packages/MoZTop/laguna/skin/laguna - New directory
Message-ID: <200204180451.g3I4pqw20406@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/skin/laguna
In directory cvs.zope.org:/tmp/cvs-serv20399/laguna

Log Message:
Directory /cvs-repository/Packages/MoZTop/laguna/skin/laguna added to the repository

=== Added directory Packages/MoZTop/laguna/skin/laguna ===




From srichter@cbu.edu  Thu Apr 18 05:56:00 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:00 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/ContentObjects/Folder - ContentOverlay.xul:1.1 ViewsOverlay.xul:1.1
Message-ID: <200204180456.g3I4u0n21355@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/ContentObjects/Folder
In directory cvs.zope.org:/tmp/cvs-serv20598/content/zopetop/ContentObjects/Folder

Added Files:
	ContentOverlay.xul ViewsOverlay.xul 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/content/zopetop/ContentObjects/Folder/ContentOverlay.xul ===
<?xml version="1.0"?>

<overlay id="FolderContentOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <tabpanel id="FolderContent">
    <button label="HELLO FOLDER CONTENT"/>
  </tabpanel>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/ContentObjects/Folder/ViewsOverlay.xul ===
<?xml version="1.0"?>

<?xul-overlay href="chrome://zopetop/content/ContentObjects/Folder/ContentOverlay.xul"?>

<?xul-overlay href="chrome://zopetop/content/Main/ShellOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Main/PreviewOverlay.xul"?>

<overlay id="FolderViewsOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <box id="main" 
       orient="vertical" flex="10"
       style="padding: 5px;">

    <tabbox id="ContentObjectViews"
            orient="vertical" 
            flex="45">

      <tabs orient="horizontal">
        <tab label="Shell" />
        <tab label="Content" />
        <tab label="Preview" />
      </tabs>
      <tabpanels flex="1">
        <tabpanel id="shell-panel"
                orient="vertical"
                flex="1">
          <box id="shell" />
        </tabpanel>
        <tabpanel id="content-panel"
                  orient="vertical"
                  flex="1">
          <box id="content" />
        </tabpanel>
        <tabpanel id="preview-panel"
                orient="vertical"
                flex="1">
          <iframe id="preview" />
        </tabpanel>
      </tabpanels>
    </tabbox>
  </box>

</overlay>




From srichter@cbu.edu  Thu Apr 18 05:56:00 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:00 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Data - foldercontents.rdf:1.1 recentfiles.rdf:1.1 tasks.rdf:1.1
Message-ID: <200204180456.g3I4u0F21387@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Data
In directory cvs.zope.org:/tmp/cvs-serv20598/content/zopetop/Data

Added Files:
	foldercontents.rdf recentfiles.rdf tasks.rdf 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/content/zopetop/Data/foldercontents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:EXPLORER="http://www.zope.org/rdf#">

   <RDF:Description about="urn:explorer:foldera">
     <EXPLORER:name>Folder A</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:foldera:documenta">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>7,200</EXPLORER:size>
       </RDF:Description>


   <RDF:Description about="urn:explorer:folderb">
     <EXPLORER:name>Folder B</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:birds:emu">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>2,980</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:birds:barnowl" EXPLORER:specimens="4">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>19,200</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:birds:raven" EXPLORER:specimens="0">
         <EXPLORER:name>Document C</EXPLORER:name>
         <EXPLORER:size>3,999</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:folderc">
     <EXPLORER:name>Folder C</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:fish:cod" EXPLORER:specimens="0">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>44,211</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:fish:swordfish" EXPLORER:specimens="3">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>16,788</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:folderd">
     <EXPLORER:name>Folder D</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:lion" EXPLORER:specimens="4">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>2,333</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:hippopotamus" EXPLORER:specimens="2">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>8,000</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:africanelephant" EXPLORER:specimens="4">
         <EXPLORER:name>Document C</EXPLORER:name>
         <EXPLORER:size>34,225</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:llama" EXPLORER:specimens="3">
         <EXPLORER:name>Document D</EXPLORER:name>
         <EXPLORER:size>7,888</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:polarbear" EXPLORER:specimens="0">
         <EXPLORER:name>Document E</EXPLORER:name>
         <EXPLORER:size>9,711</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:aardvark" EXPLORER:specimens="2">
         <EXPLORER:name>Document F</EXPLORER:name>
         <EXPLORER:size>5,100</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:ninebandedarmadillo" EXPLORER:specimens="0">
         <EXPLORER:name>Document G</EXPLORER:name>
         <EXPLORER:size>7,655</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:foldere">
     <EXPLORER:name>Folder E</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:reptiles:anaconda" EXPLORER:specimens="1">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>100,544</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:reptiles:chameleon" EXPLORER:specimens="2">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>12,655</EXPLORER:size>
       </RDF:Description>

  <RDF:Seq about="urn:explorer:data">
     <RDF:li>
         <RDF:Seq about="urn:explorer:foldera">
           <RDF:li resource="urn:explorer:foldera:documenta"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderb">
           <RDF:li resource="urn:explorer:birds:emu"/>
           <RDF:li resource="urn:explorer:birds:barnowl"/>
           <RDF:li resource="urn:explorer:birds:raven"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderc">
           <RDF:li resource="urn:explorer:fish:cod"/>
           <RDF:li resource="urn:explorer:fish:swordfish"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderd">
           <RDF:li resource="urn:explorer:mammals:lion"/>
           <RDF:li resource="urn:explorer:mammals:hippopotamus"/>
           <RDF:li resource="urn:explorer:mammals:africanelephant"/>
           <RDF:li resource="urn:explorer:mammals:llama"/>
           <RDF:li resource="urn:explorer:mammals:polarbear"/>
           <RDF:li resource="urn:explorer:mammals:aardvark"/>
           <RDF:li resource="urn:explorer:mammals:ninebandedarmadillo"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:foldere">
           <RDF:li resource="urn:explorer:reptiles:anaconda"/>
           <RDF:li resource="urn:explorer:reptiles:chameleon"/>
         </RDF:Seq>
    </RDF:li>
  </RDF:Seq>

</RDF:RDF>


=== Added File Packages/MoZTop/content/zopetop/Data/recentfiles.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:zopetop="http://www.xulplanet.com/rdf/zopetop#">

  <RDF:Seq about="urn:zopetop:recentfiles">
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:0" zopetop:number="0"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:1" zopetop:number="1"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:2" zopetop:number="2"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:3" zopetop:number="3"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:4" zopetop:number="4"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:5" zopetop:number="5"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:6" zopetop:number="6"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:7" zopetop:number="7"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:8" zopetop:number="8"/></RDF:li>
    <RDF:li><RDF:resource about="urn:zopetop:recentfiles:9" zopetop:number="9"/></RDF:li>
  </RDF:Seq>

</RDF:RDF>


=== Added File Packages/MoZTop/content/zopetop/Data/tasks.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:tasks="http://www.zope.org/rdf#">


   <RDF:Description about="urn:tasks:101">
     <tasks:taskid>UpdateLimit</tasks:taskid>
     <tasks:description>Update the item limit of {ContainerId}.</tasks:description>
     <tasks:progress>70%</tasks:progress>
   </RDF:Description>


   <RDF:Description about="urn:tasks:102">
     <tasks:taskid>DeleteItems</tasks:taskid>
     <tasks:description>Deletes specified items from {ContainerId}.</tasks:description>
     <tasks:progress>30%</tasks:progress>
   </RDF:Description>


   <RDF:Description about="urn:tasks:103">
     <tasks:taskid>AddImage</tasks:taskid>
     <tasks:description>Add Image {ImageId} to Container {ContainerId}.</tasks:description>
     <tasks:progress>93%</tasks:progress>
   </RDF:Description>


  <RDF:Seq about="urn:tasks:data">
     <RDF:li resource="urn:tasks:101" />
     <RDF:li resource="urn:tasks:102" />
     <RDF:li resource="urn:tasks:103" />
  </RDF:Seq>

</RDF:RDF>




From srichter@cbu.edu  Thu Apr 18 05:56:02 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:02 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Main - ContentOverlay.xul:1.1 MainOverlay.xul:1.1 PreviewOverlay.xul:1.1 ShellOverlay.xul:1.1
Message-ID: <200204180456.g3I4u2v21435@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Main
In directory cvs.zope.org:/tmp/cvs-serv20598/content/zopetop/Main

Added Files:
	ContentOverlay.xul MainOverlay.xul PreviewOverlay.xul 
	ShellOverlay.xul 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/content/zopetop/Main/ContentOverlay.xul ===
<?xml version="1.0"?>

<overlay id="ContentOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <box id="content">

  </box>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Main/MainOverlay.xul ===
<?xml version="1.0"?>

<?xul-overlay href="chrome://zopetop/content/ContentObjects/Folder/ContentOverlay.xul"?>

<?xul-overlay href="chrome://zopetop/content/Main/ShellOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Main/PreviewOverlay.xul"?>

<overlay id="MainOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

    <box id="main" flex="10"/>
    <spacer flex="1"/>
    <box id="ActiveObjectsPanel"
         orient="horizontal"
         style="border: 1px solid black;">
      <spring flex="100%"/>
    </box>

</overlay>


=== Added File Packages/MoZTop/content/zopetop/Main/PreviewOverlay.xul ===
<?xml version="1.0"?>

<overlay id="PreviewOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <iframe id="preview" height="20" src="http://www.zope.org" flex="1"/>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Main/ShellOverlay.xul ===
<?xml version="1.0"?>

<overlay id="ShellOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <box id="shell"
       orient="vertical">  
    <label>This is a Zope shell that allows you to manipulate Zope obejcts quickly via a 
      command prompt</label>
    <editor type="content-primary" id="shell-textarea" flex="1" 
            style="width: 300px"/>
  </box>

</overlay>



From srichter@cbu.edu  Thu Apr 18 05:56:01 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:01 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop - contents.rdf:1.1 file.js:1.1 foldercontents.rdf:1.1 registry_demo.xul:1.1 tasks.rdf:1.1 test-out.rdf:1.1 test-out.xul:1.1 test-tree.rdf:1.1 test-tree.xul:1.1 zopelogo.png:1.1 zopetop:1.1 zopetop.css:1.1 zopetop.js:1.1 zopetop.xul:1.1 zopetopOverlay.xul:1.1
Message-ID: <200204180456.g3I4u1S21415@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop
In directory cvs.zope.org:/tmp/cvs-serv20598/content/zopetop

Added Files:
	contents.rdf file.js foldercontents.rdf registry_demo.xul 
	tasks.rdf test-out.rdf test-out.xul test-tree.rdf 
	test-tree.xul zopelogo.png zopetop zopetop.css zopetop.js 
	zopetop.xul zopetopOverlay.xul 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/content/zopetop/contents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">

  <RDF:Seq about="urn:mozilla:package:root">
    <RDF:li resource="urn:mozilla:package:zopetop"/>
  </RDF:Seq>

  <RDF:Description about="urn:mozilla:package:zopetop"
        chrome:displayName="Zopetop for Zope 3"
        chrome:author="Zope Corp. and Contributors"
        chrome:name="zopetop">
  </RDF:Description>

  <RDF:Seq about="urn:mozilla:overlays">
    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
  </RDF:Seq>

  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
    <RDF:li>chrome://zopetop/content/zopetopOverlay.xul</RDF:li>
  </RDF:Seq> 

</RDF:RDF>

=== Added File Packages/MoZTop/content/zopetop/file.js === (677/777 lines abridged)
/*** -*- Mode: Javascript; tab-width: 2;

The contents of this file are subject to the Mozilla Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.

The Original Code is Collabnet code.
The Initial Developer of the Original Code is Collabnet.

Portions created by Collabnet are
Copyright (C) 2000 Collabnet.  All
Rights Reserved.

Contributor(s): Pete Collins, Doug Turner, Brendan Eich, Warren Harris, Eric Plaster


 File API (The purpose of this file is to make it a little easier to do file IO from js) 

       file.js

 Function List

    // Constructor
    File(aPath)                        // creates the File object and sets the file path

    open(aMode, aPermissions);         // open a file handle for reading, writing or appending.  permissions are optional.
    close();                           // closes a file handle
    exists();                          // check to see if a file exists
    read();                            // returns the contents of a file
    readline();                        // returns the next line in the file.
    write(aContents);                  // writes the contents out to file.
    eof();                             // check 'end of file' status

    // file attributes
    permissions();                     // returns the files permissions
    dateModified();                    // returns the last modified date in locale string
    size();                            // returns the file size

    // file string manipulation
    path();                            // returns the path
    leaf();                            // leaf is the endmost file string ex: foo.html in /myDir/foo.html
    extension();                       // returns a file extension if there is one
    dirPath()                          // returns the dir part of a path


[-=- -=- -=- 677 lines omitted -=- -=- -=-]

    "   dateModified();\n"                  +
    "   size();\n"                          +
    "   extension();\n"                     +
    "   dirPath();\n"                       + 
    "   nsIFile();\n"                       + 
    "   help();\n";

  dump(help+"\n");

  return "";
},

/********************* CLOSE ****************************/
close : function() 
{
  /***************** Destroy Instances *********************/
  if(this.fileInst)       delete this.fileInst;
  if(this.fileChannel)    delete this.fileChannel;
  if(this.inputStream)    delete this.inputStream;
  if(this.transport)      delete this.transport;
  if(this.mode)           this.mode=null;
  if(this.outStream) {
    this.outStream.close();
    delete this.outStream;
  }
  if(this.lineBuffer)     this.lineBuffer=null;
  this.position           = 0;
  /***************** Destroy Instances *********************/

  return JSFILE_OK;
},

dumpError: function(e, type, number, skipclose) 
{
  dump("-----======[ ERROR ]=====-----\n");
  dump("Error in "+JSLIB_FILE+":  "+type+"\n");
  if(e) {
    dump("Name:              "+e.name+"\n");
    dump("Message:           "+e.message+"\n");
    dump("Result:            0x"+e.result.toString(16)+"\n");
    dump("Location:          "+e.location+"\n");
  }
  dump("NS_ERROR_NUMBER:   "+number+"\n");
  dump("------------------------------\n");
  if(skipclose) {
    this.close();
  }
  return number;
}
};

=== Added File Packages/MoZTop/content/zopetop/foldercontents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:explorer="http://www.zope.org/rdf#">

  <!-- Object Meta Data -->

  <RDF:Description about="urn:explorer:foldera">
    <explorer:name>Folder A</explorer:name>
  </RDF:Description>

    <RDF:Description about="urn:explorer:foldera:documenta">
      <explorer:name>Document A</explorer:name>
    </RDF:Description>
    
      <RDF:Description about="urn:explorer:foldera:documenta:foo">
        <explorer:name>Foo Bar</explorer:name>
      </RDF:Description>


   <!-- Object Relationships --> 

   <RDF:Seq about="urn:explorer:data">
     <RDF:li resource="urn:explorer:foldera"/>
   </RDF:Seq>

   <RDF:Seq about="urn:explorer:foldera">
     <RDF:li resource="urn:explorer:foldera:documenta"/>
  </RDF:Seq>

   <RDF:Seq about="urn:explorer:foldera:documenta">
     <RDF:li resource="urn:explorer:foldera:documenta:foo"/>
   </RDF:Seq>


</RDF:RDF>


=== Added File Packages/MoZTop/content/zopetop/registry_demo.xul ===
<?xml version="1.0"?>  <!-- -*- Mode: HTML -*- -->

<?xml-stylesheet href="chrome://global/skin" type="text/css"?>

<window width="400" height="300"
  onload="initTaskList();"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <script>
    <![CDATA[
      var RDF =
        Components
        .classes["@mozilla.org/rdf/rdf-service;1"]
        .getService(Components.interfaces.nsIRDFService);

      var DS =
        Components
        .classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
        .createInstance(Components.interfaces.nsIRDFDataSource);

      function initTaskList()
      {
        addTask();

        // Add the datasource to the outliner
        var outliner = document.getElementById("TaskList");
        outliner.database.AddDataSource(DS);
        outliner.setAttribute("ref", "urn:tasks:root");
      }

      // This will remember the index of the last child we've added
      var taskCount = 0;

      function addTask()
      {
        // Add a new child urn:tasks:1.x beneath urn:tasks:1.
        DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
                  RDF.GetResource("http://home.netscape.com/NC-rdf#taskid"),
                  RDF.GetLiteral(taskCount),
                  true);

          DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
                    RDF.GetResource("http://home.netscape.com/NC-rdf#name"),
                    RDF.GetLiteral("Add"),
                    true);

          DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
                    RDF.GetResource("http://home.netscape.com/NC-rdf#descr"),
                    RDF.GetLiteral("DESCRIPTION " + (8 - taskCount)),
                    true);

          DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
                    RDF.GetResource("http://home.netscape.com/NC-rdf#progress"),
                    RDF.GetLiteral("97%"),
                    true);

        DS.Assert(RDF.GetResource("urn:tasks:root"),
                  RDF.GetResource("http://home.netscape.com/NC-rdf#child"),
                  RDF.GetResource("urn:tasks:" + taskCount),
                  true);

        ++taskCount;
      }
    ]]>
  </script>

  <vbox flex="1">
    <hbox>
      <button onclick="addTask();" label="Make Task" />
    </hbox>

    <outliner flex="1" id="TaskList" datasources="rdf:null"
              flags="dont-build-content"
              containment="http://home.netscape.com/NC-rdf#child">

      <outlinercols>
        <outlinercol id="taskid" flex="1" label="Id" sort="?taskid"
                     primary="true" />
        <splitter/>
        <outlinercol id="name" label="Name" sort="?name" flex="2"/>
        <splitter/>
        <outlinercol id="description" label="Description" sort="?descr" flex="10"/>
        <splitter/>
        <outlinercol id="progress" label="Progress" sort="?progress" flex="3"/>
      </outlinercols>

      <template>
        <rule>
          <conditions>
            <outlineritem uri="?uri" />
            <member container="?uri" child="?task" />
          </conditions>
  
          <bindings>
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#taskid"
                     object="?taskid" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#name"
                     object="?name" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#descr"
                     object="?descr" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#progress"
                     object="?progress" />
          </bindings>
  
          <action>
            <outlinerchildren>
              <outlineritem uri="?task">
                <outlinerrow>
                  <outlinercell label="?taskid" />
                  <outlinercell label="?name" />
                  <outlinercell label="?descr" />
                  <outlinercell label="?progress" />
                </outlinerrow>
              </outlineritem>
            </outlinerchildren>
          </action>
        </rule>
      </template>

    </outliner>
  </vbox>
</window>


=== Added File Packages/MoZTop/content/zopetop/tasks.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:tasks="http://www.zope.org/rdf#">


   <RDF:Description about="urn:tasks:101">
     <tasks:taskid>UpdateLimit</tasks:taskid>
     <tasks:description>Update the item limit of {ContainerId}.</tasks:description>
     <tasks:progress>70%</tasks:progress>
   </RDF:Description>


   <RDF:Description about="urn:tasks:102">
     <tasks:taskid>DeleteItems</tasks:taskid>
     <tasks:description>Deletes specified items from {ContainerId}.</tasks:description>
     <tasks:progress>30%</tasks:progress>
   </RDF:Description>


   <RDF:Description about="urn:tasks:103">
     <tasks:taskid>AddImage</tasks:taskid>
     <tasks:description>Add Image {ImageId} to Container {ContainerId}.</tasks:description>
     <tasks:progress>93%</tasks:progress>
   </RDF:Description>


  <RDF:Seq about="urn:tasks:data">
     <RDF:li resource="urn:tasks:101" />
     <RDF:li resource="urn:tasks:102" />
     <RDF:li resource="urn:tasks:103" />
  </RDF:Seq>

</RDF:RDF>


=== Added File Packages/MoZTop/content/zopetop/test-out.rdf ===
<?xml version="1.0"?>

<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:nc="http://home.netscape.com/NC-rdf#">
  <rdf:Seq about="urn:root">
        <rdf:li>
          <rdf:Description ID="ch1" nc:name="Introduction to JavaScript" nc:page="12" />
        </rdf:li>

        <rdf:li>
          <rdf:Description ID="ch2" nc:name="Lexical Structure" nc:page="13" />
        </rdf:li>

        <rdf:li>
          <rdf:Description ID="ch3" nc:name="Data Types and Values" nc:page="15" />
        </rdf:li>
  </rdf:Seq>

<!--
  <rdf:Seq about="#ch1">
        <rdf:li>
          <rdf:Description ID="ch1.1" nc:name="JavaScript Myths" nc:page="16" />
        </rdf:li>

        <rdf:li>
          <rdf:Description ID="ch1.2" nc:name="JavaScript Versions" nc:page="19" />
        </rdf:li>
  </rdf:Seq>

  <rdf:Seq about="#ch1.1">
        <rdf:li>
          <rdf:Description ID="ch1.1.1" nc:name="JavaScript Is Not Java" nc:page="20" />
        </rdf:li>
  </rdf:Seq>

  <rdf:Seq about="#ch2">
        <rdf:li>
          <rdf:Description ID="ch2.1" nc:name="Case Sensitivity" nc:page="21" />
        </rdf:li>
  </rdf:Seq>

  <rdf:Seq about="#ch3">
        <rdf:li>
          <rdf:Description ID="ch3.1" nc:name="Numbers" nc:page="30" />
        </rdf:li>
  </rdf:Seq>
-->
</rdf:RDF>


=== Added File Packages/MoZTop/content/zopetop/test-out.xul ===
<?xml version="1.0"?>

<?xml-stylesheet href="chrome://global/skin" type="text/css"?>

<window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        align="vertical">

  <outliner width="600" height="300"
            datasources="test-out.rdf" 
            ref="urn:root">

    <outlinercols>
      <outlinercol id="ChapterColumn" flex="1" label="Chapter"
                   primary="true" />

    </outlinercols>

      <template>
        <rule>
            <outlinerchildren>
              <outlineritem>
                <outlinerrow>
                  <outlinercell label="rdf:http://home.netscape.com/NC-rdf#name" />
                </outlinerrow>
              </outlineritem>
            </outlinerchildren>
        </rule>
      </template>

  </outliner>


</window>


=== Added File Packages/MoZTop/content/zopetop/test-tree.rdf ===
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:NC="http://home.netscape.com/NC-rdf#">
  <RDF:Seq ID="urn:root">
    <RDF:li>
      <RDF:Description ID="R0" NC:Name="Number Zero">
        <NC:child>
          <RDF:Description ID="R0_1" NC:Name="Number One Point One">
            <NC:child>
              <RDF:Description ID="R0_1_1" NC:Name="Number One Point One Point One" />
            </NC:child>
          </RDF:Description>
        </NC:child>
        <NC:child>
          <RDF:Description ID="R0_2" NC:Name="Number One Point Two" />
        </NC:child>
      </RDF:Description>
      <RDF:Description ID="R1" NC:Name="Number One">
        <NC:child>
          <RDF:Description ID="R1_1" NC:Name="Number One Point One">
            <NC:child>
              <RDF:Description ID="R1_1_1" NC:Name="Number One Point One Point One" />
            </NC:child>
          </RDF:Description>
        </NC:child>
        <NC:child>
          <RDF:Description ID="R1_2" NC:Name="Number One Point Two" />
        </NC:child>
      </RDF:Description>
      <RDF:Description ID="R2" NC:Name="Number Two" />
      <RDF:Description ID="R3" NC:Name="Number Three" />
    </RDF:li>
  </RDF:Seq>
</RDF:RDF>


=== Added File Packages/MoZTop/content/zopetop/test-tree.xul ===
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>

<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        align="vertical" id="foo">



  <tree datasources="file://Program Files/mozilla.org/Mozilla/chrome/zopetop/content/zopetop/test-tree.rdf"
        flex="1" 
        ref="test-tree.rdf#root">
    <template>
      <treechildren>
        <treeitem uri="rdf:*">
          <treerow>
            <treecell class="treecell-indent"
                      label="rdf:http://home.netscape.com/NC-rdf#Name" />
          </treerow>
        </treeitem>
      </treechildren>
    </template>

    <treehead>
      <treerow>
        <treecell label="Name" />
      </treerow>
    </treehead>
  </tree>



  <outliner id="explorer" flex="1"
            width="200" height="300" 
            datasources="rdf:test-tree.rdf" 
            ref="urn:root">

    <outlinercols>
      <outlinercol id="Name" label="Name" flex="1" primary="true"/>
    </outlinercols>

      <template>
        <rule iscontainer="false">
              <outlinerrow>
                <outlinercell label="rdf:http://home.netscape.com/NC-rdf#Name"/>
              </outlinerrow>
        </rule>
<!--
        <rule>
          <outlinerchildren>
            <outlineritem>
              <outlinerrow>
                <outlinercell label="rdf:http://home.netscape.com/NC-rdf#Name"
                              onclick="alert('bar');"/>
              </outlinerrow>
            </outlineritem>
          </outlinerchildren>
        </rule>
-->
      </template>

  </outliner>
</window>



=== Added File Packages/MoZTop/content/zopetop/zopelogo.png ===
  <Binary-ish file>

=== Added File Packages/MoZTop/content/zopetop/zopetop ===
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://zopetop/content/zopetop.css" type="text/css"?>
<!--
<?xul-overlay href="chrome://zopetop/content/Menu/KeySetOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Menu/MenuOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Menu/ToolBarOverlay.xul"?>

<?xul-overlay href="chrome://zopetop/content/Inspector/InspectorOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Main/MainOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/StatusBar/StatusBarOverlay.xul"?>
-->

<!DOCTYPE window [
<!ENTITY % zopetopDTD SYSTEM "chrome://zopetop/locale/zopetop.dtd">
%zopetopDTD;
]>

<window
   title      = "ZopeTop for Zope 3"
   id         = "zopetop-main-window"
   xmlns      = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html = "http://www.w3.org/1999/xhtml"
   width      = "800"
   height     = "600"
   orient     = "vertical"
   persist    = "screenX screenY width height sizemode"
   onload     = "startProgram();"
   onclose    = "return closeProgram();">

<!--
  <script type="application/x-javascript" src="zopetop.js"/>
  <script type="application/x-javascript" src="StatusBar/TaskManager.js"/>

  <keyset id="menu-keyset"/>

  <toolbox>
    <menubar id="zopetop-menubar"/>
    <toolbar id="zopetop-toolbar"/>
  </toolbox>

  <box orient="horizontal" flex="10">
    <tabbox id="inspector"/>
    <splitter collapse="before">
      <spacer flex="1"/><grippy/><spacer flex="1"/>
    </splitter>
    <box id="main" />
  </box>

  <splitter collapse="after">
    <spacer flex="1"/><grippy/><spacer flex="1"/>
  </splitter>

  <tabbox id="statusbar"/>
-->
</window>


=== Added File Packages/MoZTop/content/zopetop/zopetop.css ===
@import url(chrome://global/skin/); 

#document
{ 
  font-size: 10pt;
}

=== Added File Packages/MoZTop/content/zopetop/zopetop.js ===
// Constants
var RDF = null;
var myDatasource = null;

function startProgram() {
  setupExplorerDS();
  initTaskList();
}

function closeProgram() {

}


/* Setting Up Explorer Data Source */

var ExplorerObserver = {
  onBeginLoad: function(aSink)
    {},

  onInterrupt: function(aSink)
    {},

  onResume: function(aSink)
    {},

  onEndLoad: function(aSink)
  { //alert("Loading Explorer items done!");       
    },

  onError: function(aSink, aStatus, aErrorMsg)
    { alert("error! " + aErrorMsg); }
};


function setupExplorerDS() {
  var ExplorerRDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                              .getService(Components.interfaces.nsIRDFService);

  var ds = ExplorerRDF.GetDataSource("http://physics.cbu.edu:8080/tree;view/getRDFTree.rdf");

  var remote =
    ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);

  var sink =
    ds.QueryInterface(Components.interfaces.nsIRDFXMLSink);
    sink.addXMLSinkObserver(ExplorerObserver);

  outliner = document.getElementById('explorer');
  outliner.database.AddDataSource(ds);
}


/* Managing the active object panel */

function activateSelectedObject(event) {
    /* Activate a selected object */
    var index = event.target.parentNode.currentIndex + 1;
    var label = event.target.parentNode.getElementsByTagName('outlinerrow')[index]
	             .firstChild.getAttribute('label');
    addActiveObject(label)
}

function addActiveObject(label) {
    /* Add an Active Object Button to the Panel */
    var panel = document.getElementById("ActiveObjectsPanel");
    var button = document.createElement("button");
    button.setAttribute("id", label);
    button.setAttribute("label", label);
    button.setAttribute("onclick", "wakeupObject(this);");
    panel.appendChild(button);
}

function wakeupObject(obj) {

    var tabbox = document.getElementById('ContentObjectViews');

    // create tab
    var tab = document.createElement("tab");
    tab.setAttribute("id", "test");
    tab.setAttribute("label", "Test");
    tabbox.firstChild.appendChild(tab);

    var ol = document.getElementById('FolderContentOverlay');
    alert(ol);   

}



=== Added File Packages/MoZTop/content/zopetop/zopetop.xul ===
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://zopetop/content/zopetop.css" type="text/css"?>


<?xul-overlay href="chrome://zopetop/content/Menu/KeySetOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Menu/MenuOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Menu/ToolBarOverlay.xul"?>

<?xul-overlay href="chrome://zopetop/content/Inspector/InspectorOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Main/MainOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/StatusBar/StatusBarOverlay.xul"?>

<!DOCTYPE window [
<!ENTITY % zopetopDTD SYSTEM "chrome://zopetop/locale/zopetop.dtd">
%zopetopDTD;
]>

<window
   title      = "ZopeTop for Zope 3"
   id         = "zopetop-main-window"
   xmlns      = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html = "http://www.w3.org/1999/xhtml"
   width      = "800"
   height     = "600"
   orient     = "vertical"
   persist    = "screenX screenY width height sizemode"
   onload     = "startProgram();"
   onclose    = "return closeProgram();">

  <script type="application/x-javascript" src="zopetop.js"/>
  <script type="application/x-javascript" src="StatusBar/TaskManager.js"/>

  <keyset id="menu-keyset"/>

  <toolbox>
    <menubar id="zopetop-menubar"/>
    <toolbar id="zopetop-toolbar"/>
  </toolbox>

  <box orient="horizontal" flex="10">
    <tabbox id="inspector"/>
    <splitter collapse="before">
      <spacer flex="1"/><grippy/><spacer flex="1"/>
    </splitter>
    <box id="main" />
  </box>

  <splitter collapse="after">
    <spacer flex="1"/><grippy/><spacer flex="1"/>
  </splitter>

  <tabbox id="statusbar"/>

</window>


=== Added File Packages/MoZTop/content/zopetop/zopetopOverlay.xul ===
<?xml version="1.0"?>

<!DOCTYPE window SYSTEM "chrome://zopetop/locale/zopetopOverlay.dtd"> 

<overlay id="zopetopOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

<script type="application/x-javascript">

function runZopetop()
{
	window.openDialog('chrome://zopetop/content/', '_blank', 'chrome,dialog=no');
}
	
</script>

<menupopup id="taskPopup">
	<menuitem label="&menu-tasks-zopetop:label;" oncommand="runZopetop();"/>
	<menuseparator/>
</menupopup>

</overlay>




From srichter@cbu.edu  Thu Apr 18 05:56:01 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:01 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Inspector - ExplorerOverlay.xul:1.1 InspectorOverlay.xul:1.1 PropertiesOverlay.xul:1.1 SitesOverlay.xul:1.1 fc.rdf:1.1 foldercontents.rdf:1.1
Message-ID: <200204180456.g3I4u1C21423@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Inspector
In directory cvs.zope.org:/tmp/cvs-serv20598/content/zopetop/Inspector

Added Files:
	ExplorerOverlay.xul InspectorOverlay.xul PropertiesOverlay.xul 
	SitesOverlay.xul fc.rdf foldercontents.rdf 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/content/zopetop/Inspector/ExplorerOverlay.xul ===
<?xml version="1.0"?>

<overlay id="ExplorerOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <outliner id="explorer" flex="1" 
            datasources="rdf:null" 
            ref="urn:explorer:data"
            ondblclick="activateSelectedObject(event)">
    <outlinercols>
      <outlinercol id="Name" label="Name" flex="1" primary="true"/>
    </outlinercols>
     
    <template>
      <rule>
        <conditions>
          <content uri="?list"/>
          <member container="?list" child="?child"/>
          <triple subject="?child"
                  predicate="http://www.zope.org/rdf#name"
                  object="?name"/>
        </conditions>
        <action>
          <outlinerchildren>
            <outlineritem uri="?child">
              <outlinerrow>
                <outlinercell label="?name"/>
              </outlinerrow>
            </outlineritem>
          </outlinerchildren>
        </action>
      </rule>
    </template>
  </outliner>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Inspector/InspectorOverlay.xul ===
<?xml version="1.0"?>

<?xul-overlay href="chrome://zopetop/content/Inspector/ExplorerOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Inspector/PropertiesOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/Inspector/SitesOverlay.xul"?>

<overlay id="InspectorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <tabbox id="inspector"
          orient="vertical" 
          flex="1"
          style="padding: 5px;">

    <tabs orient="horizontal">
      <tab label="Sites" />
      <tab label="Explorer" />
      <tab label="Properties" />
    </tabs>
    <tabpanels flex="1">
      <tabpanel id="sites-panel"
                orient="vertical"
                flex="1">
        <box id="sites-list" />
      </tabpanel>
      <tabpanel id="explorer-panel"
                orient="vertical"
                flex="1">
        <outliner id="explorer"/>
      </tabpanel>
      <tabpanel id="props-panel"
                orient="vertical"
                flex="1">

        <box id="props-edit" />

      </tabpanel>
    </tabpanels>
  </tabbox>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Inspector/PropertiesOverlay.xul ===
<?xml version="1.0"?>

<overlay id="PropertiesOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

        <box id="props-edit"
             orient="vertical"
             flex="1">

          <groupbox>
            <caption label="Edit"/>
          <grid> 
	    <columns> 
	       <column /> 
	       <column /> 
	       <column flex="1"/> 
	    </columns> 
	
	    <rows>  
	      <row valign="middle" flex="1"> 
                <box />
	        <label control="field_id" value="Id"/>
	        <textbox id="field_id" value="loaded"/>
	      </row> 
	      <row valign="middle" flex="1"> 
                <box />
	        <label control="field_title" value="Title"/>
	        <textbox id="field_title" value="This is my loaded Folder"/>
	      </row> 
	      <row valign="middle" flex="1"> 
                <box />
	        <label control="field_limit" value="Limit"/>
	        <textbox id="field_limit" value="1002"/>
	      </row> 
	      <row valign="middle" flex="1"> 
	        <checkbox id="field_propertyIds" checked="false" 
                          value="extra"
                          style="padding: 0px; margin: 0px;"/>
	        <label control="field_extra" value="Extra"/>
	        <textbox id="field_extra" value="super"/>
	      </row> 
	    </rows> 
	  </grid> 

          <box>
             <spacer flex="100%" />
             <button label="Delete" />
             <button label="Save" />
          </box>
          </groupbox>

          <groupbox>
            <caption label="Add"/>

          <grid> 
	    <columns> 
	      <column /> 
	      <column flex="1"/> 
	    </columns> 
	
	    <rows>  
	      <row valign="middle" flex="1"> 
	        <label control="field_id" value="Id"/>
	         <textbox id="field_id"/>
	      </row> 
	      <row valign="middle" flex="1"> 
	        <label control="field_type" value="Type"/>
	        <menulist id="field_type">
	          <menupopup>
	            <menuitem label="Integer"/>
	            <menuitem label="Float"/>
	            <menuitem label="String" selected="true"/>
	          </menupopup>
	        </menulist>
	      </row> 
	      <row valign="middle" flex="1"> 
	           <label control="field_defaultValue" value="Default"/>
	           <textbox id="field_defaultValue" />
	      </row> 
	    </rows> 
	  </grid> 

          <box>
             <spacer flex="100%" />
             <button label="Add" />
          </box>

          </groupbox>
         </box>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Inspector/SitesOverlay.xul ===
<?xml version="1.0"?>

<overlay id="SitesOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Inspector/fc.rdf ===
<?xml version="1.0" ?> 
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:explorer="http://www.zope.org/rdf#">
  <RDF:Description about="urn:explorer:img">
    <explorer:name>img</explorer:name> 
  </RDF:Description>

  <RDF:Description about="urn:explorer:addThree">
    <explorer:name>addThree</explorer:name> 
  </RDF:Description>

  <RDF:Description about="urn:explorer:addTwo">
    <explorer:name>addTwo</explorer:name> 
  </RDF:Description>

  <RDF:Seq about="urn:explorer:data">
    <RDF:li resource="urn:explorer:img" /> 
    <RDF:li resource="urn:explorer:addThree" /> 
    <RDF:li resource="urn:explorer:addTwo" /> 
  </RDF:Seq>
</RDF:RDF>

=== Added File Packages/MoZTop/content/zopetop/Inspector/foldercontents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:EXPLORER="http://www.zope.org/rdf#">

   <RDF:Description about="urn:explorer:foldera">
     <EXPLORER:name>Folder A</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:foldera:documenta">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>7,200</EXPLORER:size>
       </RDF:Description>


   <RDF:Description about="urn:explorer:folderb">
     <EXPLORER:name>Folder B</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:birds:emu">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>2,980</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:birds:barnowl" EXPLORER:specimens="4">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>19,200</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:birds:raven" EXPLORER:specimens="0">
         <EXPLORER:name>Document C</EXPLORER:name>
         <EXPLORER:size>3,999</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:folderc">
     <EXPLORER:name>Folder C</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:fish:cod" EXPLORER:specimens="0">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>44,211</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:fish:swordfish" EXPLORER:specimens="3">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>16,788</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:folderd">
     <EXPLORER:name>Folder D</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:lion" EXPLORER:specimens="4">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>2,333</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:hippopotamus" EXPLORER:specimens="2">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>8,000</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:africanelephant" EXPLORER:specimens="4">
         <EXPLORER:name>Document C</EXPLORER:name>
         <EXPLORER:size>34,225</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:llama" EXPLORER:specimens="3">
         <EXPLORER:name>Document D</EXPLORER:name>
         <EXPLORER:size>7,888</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:polarbear" EXPLORER:specimens="0">
         <EXPLORER:name>Document E</EXPLORER:name>
         <EXPLORER:size>9,711</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:aardvark" EXPLORER:specimens="2">
         <EXPLORER:name>Document F</EXPLORER:name>
         <EXPLORER:size>5,100</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:mammals:ninebandedarmadillo" EXPLORER:specimens="0">
         <EXPLORER:name>Document G</EXPLORER:name>
         <EXPLORER:size>7,655</EXPLORER:size>
       </RDF:Description>

   <RDF:Description about="urn:explorer:foldere">
     <EXPLORER:name>Folder E</EXPLORER:name>
   </RDF:Description>

       <RDF:Description about="urn:explorer:reptiles:anaconda" EXPLORER:specimens="1">
         <EXPLORER:name>Document A</EXPLORER:name>
         <EXPLORER:size>100,544</EXPLORER:size>
       </RDF:Description>

       <RDF:Description about="urn:explorer:reptiles:chameleon" EXPLORER:specimens="2">
         <EXPLORER:name>Document B</EXPLORER:name>
         <EXPLORER:size>12,655</EXPLORER:size>
       </RDF:Description>

  <RDF:Seq about="urn:explorer:data">
     <RDF:li>
         <RDF:Seq about="urn:explorer:foldera">
           <RDF:li resource="urn:explorer:foldera:documenta"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderb">
           <RDF:li resource="urn:explorer:birds:emu"/>
           <RDF:li resource="urn:explorer:birds:barnowl"/>
           <RDF:li resource="urn:explorer:birds:raven"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderc">
           <RDF:li resource="urn:explorer:fish:cod"/>
           <RDF:li resource="urn:explorer:fish:swordfish"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:folderd">
           <RDF:li resource="urn:explorer:mammals:lion"/>
           <RDF:li resource="urn:explorer:mammals:hippopotamus"/>
           <RDF:li resource="urn:explorer:mammals:africanelephant"/>
           <RDF:li resource="urn:explorer:mammals:llama"/>
           <RDF:li resource="urn:explorer:mammals:polarbear"/>
           <RDF:li resource="urn:explorer:mammals:aardvark"/>
           <RDF:li resource="urn:explorer:mammals:ninebandedarmadillo"/>
         </RDF:Seq>
         <RDF:Seq about="urn:explorer:foldere">
           <RDF:li resource="urn:explorer:reptiles:anaconda"/>
           <RDF:li resource="urn:explorer:reptiles:chameleon"/>
         </RDF:Seq>
    </RDF:li>
  </RDF:Seq>

</RDF:RDF>




From srichter@cbu.edu  Thu Apr 18 05:56:03 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:03 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/locale/en-US/laguna - contents.rdf:1.1 laguna.dtd:1.1 lagunaOverlay.dtd:1.1
Message-ID: <200204180456.g3I4u3B21491@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/locale/en-US/laguna
In directory cvs.zope.org:/tmp/cvs-serv20598/laguna/locale/en-US/laguna

Added Files:
	contents.rdf laguna.dtd lagunaOverlay.dtd 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/laguna/locale/en-US/laguna/contents.rdf ===
<?xml version="1.0"?> 

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> 

  <RDF:Seq about="urn:mozilla:locale:root"> 
    <RDF:li resource="urn:mozilla:locale:en-US"/> 
  </RDF:Seq> 

  <RDF:Description about="urn:mozilla:locale:en-US"> 
    <chrome:packages> 
      <RDF:Seq about="urn:mozilla:locale:en-US:packages"> 
        <RDF:li resource="urn:mozilla:locale:en-US:laguna"/> 
      </RDF:Seq> 
    </chrome:packages> 
  </RDF:Description> 

</RDF:RDF> 

=== Added File Packages/MoZTop/laguna/locale/en-US/laguna/laguna.dtd ===
<!ENTITY window.title              "Laguna"> 
<!ENTITY menu-file:label           "File">
<!ENTITY menu-file:accesskey       "F">
<!ENTITY menu-file-close:key       "W">
<!ENTITY menu-file-close:label     "Close">
<!ENTITY menu-file-close:accesskey "C">

=== Added File Packages/MoZTop/laguna/locale/en-US/laguna/lagunaOverlay.dtd ===
<!ENTITY menu-tasks-laguna:label  "Laguna Text Editor">



From srichter@cbu.edu  Thu Apr 18 05:56:03 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:03 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/skin/laguna - contents.rdf:1.1 laguna.css:1.1
Message-ID: <200204180456.g3I4u3l21500@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/skin/laguna
In directory cvs.zope.org:/tmp/cvs-serv20598/laguna/skin/laguna

Added Files:
	contents.rdf laguna.css 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/laguna/skin/laguna/contents.rdf ===
<?xml version="1.0"?> 

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> 

  <RDF:Seq about="urn:mozilla:skin:root"> 
    <RDF:li resource="urn:mozilla:skin:laguna"/> 
  </RDF:Seq>

 <RDF:Description about="urn:mozilla:skin:laguna"
        chrome:displayName="Laguna Text Editor"
        chrome:author="Your Name"
        chrome:name="laguna">
  </RDF:Description>


</RDF:RDF> 

=== Added File Packages/MoZTop/laguna/skin/laguna/laguna.css ===
@import url(chrome://global/skin/); 

#document
{ 
  font-size: 10pt;
}


window > box {
  background-color: #CCCCCC;
}
  
menubar,toolbar,tabpanel {
  background-color: lightblue;
  border-top: 1px solid white;
  border-bottom: 1px solid #666666;
  border-left: 1px solid white;
  border-right: 1px solid #666666;
}




From srichter@cbu.edu  Thu Apr 18 05:56:03 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:03 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna/content/laguna - closed.png:1.1 contents.rdf:1.1 document.gif:1.1 document.png:1.1 folder.png:1.1 header.gif:1.1 headerbg.png:1.1 laguna.css:1.1 laguna.js:1.1 laguna.xul:1.1 lagunaOverlay.xul:1.1 menuoverlay.xul:1.1 userfolder.png:1.1
Message-ID: <200204180456.g3I4u3V21507@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna/content/laguna
In directory cvs.zope.org:/tmp/cvs-serv20598/laguna/content/laguna

Added Files:
	closed.png contents.rdf document.gif document.png folder.png 
	header.gif headerbg.png laguna.css laguna.js laguna.xul 
	lagunaOverlay.xul menuoverlay.xul userfolder.png 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/laguna/content/laguna/closed.png ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/contents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">

  <RDF:Seq about="urn:mozilla:package:root">
    <RDF:li resource="urn:mozilla:package:laguna"/>
  </RDF:Seq>

  <RDF:Description about="urn:mozilla:package:laguna"
        chrome:displayName="Laguna Text Editor"
        chrome:author="Your Name"
        chrome:name="laguna">
  </RDF:Description>

  <RDF:Seq about="urn:mozilla:overlays"> 
    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/> 
  </RDF:Seq> 

  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul"> 
    <RDF:li>chrome://laguna/content/lagunaOverlay.xul</RDF:li> 
  </RDF:Seq> 

</RDF:RDF>

=== Added File Packages/MoZTop/laguna/content/laguna/document.gif ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/document.png ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/folder.png ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/header.gif ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/headerbg.png ===
  <Binary-ish file>

=== Added File Packages/MoZTop/laguna/content/laguna/laguna.css ===
@import url(chrome://global/skin/); 

#document
{ 
  font-size: 10pt;
}



listbox.manage{
border-style: none;
background-color: #CCCCFF;
}

listbox.contents{
border-style: none;
background-color: #DFDEFF;
}

listheader{
font-weight: bold;
border-style: none;
background-color: #A1A1F1;
}

listheader.selected{
color: white;
background-color: #7171BE;
}


splitter{
border-style: none;
background-color: #7B7AC6;
max-width: 2px;
}

tabbox{
background-color: #DFDEFF;
border-style: none;
}

tabs{
border-style: none;
}


vbox, tabpanels{
background-color: #DFDEFF;
border-style: none;
}

tab{
background-color: #DFDEFF;
}

=== Added File Packages/MoZTop/laguna/content/laguna/laguna.js ===
function closeWindow()
{
  window.close();
}


var outlinerView = {
    rowCount : 10000,
    setOutliner : function(outliner){},
    getCellText : function(row,column){
      if (column=="namecol") return "Row "+row;
      else return "February 18";
    },
    getRowProperties : function(row,prop){},
    getColumnProperties : function(column,columnElement,prop){},
    getCellProperties : function(row,column,prop){},
};

function setView()
{
    alert('Setting View!');
    document.getElementById('my-outliner').outlinerBoxObject.view=outlinerView;
};




=== Added File Packages/MoZTop/laguna/content/laguna/laguna.xul ===
<?xml version="1.0"?>
<?xml-stylesheet href="laguna.css" type="text/css"?>

<?xul-overlay href="chrome://laguna/content/menuoverlay.xul"?>

<!DOCTYPE window [
<!ENTITY % lagunaDTD SYSTEM "chrome://laguna/locale/laguna.dtd">
%lagunaDTD;
]>

<window
   title      = "&window.title;"
   id         = "laguna-main-window"
   xmlns      = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   orient="vertical"
>

<box style="background-color: #6E6EB8; background-image: url(headerbg.png);">
<image src="header.gif" />
<spacer flex="1" />
</box>


<script type="application/x-javascript" src="laguna.js"/>

<stringbundleset id="mainstrings"/> 
<keyset id="mainkeys"/> 
<commandset id="maincommands"/> 
<menubar id="menu"/> 



<box flex="1">
<listbox flex="1" class="manage">
   <listcols>
    <listcol flex="1"/>
   </listcols>
   <listitem>
    <listcell>
     <image src="closed.png" /> 
     <image src="folder.png" />
     <label>Folder 1</label>
    </listcell>
   </listitem>

<listitem>
<listcell>
<image src="closed.png" />
<image src="folder.png" />
<label>Folder 1</label>
</listcell>
</listitem>
</listbox>


<splitter collapse="before"/>




<vbox>
<tabbox orient="vertical" flex="1" debug="1">
  <tabs orient="horizontal">
    <tab label="Contents"/>
    <tab label="View"/>
    <tab label="Properties"/>
    <tab label="Security"/>
    <tab label="Undo"/>
    <tab label="Ownership"/>
  </tabs>
  <tabpanels flex="1">
    <tabpanel flex="1" orient="vertical">
<hbox style="background-color: #CCCCFF;"><image src="folder.png" /> <label>Folder at /</label></hbox>

<spacer />

<listbox flex="1" class="contents">
  <listhead  >
    <listheader label="Type"  />
    <listheader label="Name" class="selected"/>
    <listheader label="Size"/>
    <listheader label="Last Modified"/>
  </listhead>

  <listcols>
    <listcol flex="1"/>
    <listcol flex="3"/>
    <listcol flex="1"/>
    <listcol flex="1"/>
  </listcols>

  <listitem style="background-color: #CCCCFF;">
    <listcell><image src="folder.png"/></listcell>
    <listcell label="folder"/>
    <listcell label="6 Kb"/>
    <listcell label="4/15/2002@8:32PM PST"/>
  </listitem>

  <listitem>
    <listcell><image src="document.png"/></listcell>
    <listcell label="index_html"/>
    <listcell label="6 Kb"/>
    <listcell label="4/15/2002@8:32PM PST"/>
  </listitem>
  <listitem style="background-color: #CCCCFF;">
    <listcell><image src="document.png"/></listcell>
    <listcell label="index_html"/>
    <listcell label="6 Kb"/>
    <listcell label="4/15/2002@8:32PM PST"/>
  </listitem>
</listbox>
    </tabpanel>
    <tabpanel id="newstab">
      <button label="Clear News Buffer"/>
    </tabpanel>
  </tabpanels>
</tabbox>

<hbox><spacer flex="1"/> <button label="Rename" /></hbox>
</vbox>
</box>
</window>

=== Added File Packages/MoZTop/laguna/content/laguna/lagunaOverlay.xul ===
<?xml version="1.0"?>

<!DOCTYPE window SYSTEM "chrome://laguna/locale/lagunaOverlay.dtd"> 

<overlay id="lagunaOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

<script type="application/x-javascript">

function runLaguna()
{
	window.openDialog('chrome://laguna/content/', '_blank', 'chrome,dialog=no');
}
	
</script>

<menupopup id="taskPopup">
	<menuitem label="&menu-tasks-laguna:label;" oncommand="runLaguna();"/>
	<menuseparator/>
</menupopup>

</overlay>


=== Added File Packages/MoZTop/laguna/content/laguna/menuoverlay.xul ===
<?xml version="1.0"?>

<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>

<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % lagunaDTD SYSTEM "chrome://laguna/locale/laguna.dtd" >
%lagunaDTD;
]>

<overlay id="menuoverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

<script type="text/javascript" src="chrome://global/content/strres.js"/>

<stringbundleset id="mainstrings">
  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
</stringbundleset>

<commandset id="maincommands">
  <commandset id="globalEditMenuItems"/>
  <commandset id="selectEditMenuItems"/>
  <commandset id="undoEditMenuItems"/>
  <commandset id="clipboardEditMenuItems"/>
  <command id="cmd_undo"/>
  <command id="cmd_redo"/>
  <command id="cmd_cut"/>
  <command id="cmd_copy"/>
  <command id="cmd_paste"/>
  <command id="cmd_delete"/>
  <command id="cmd_selectAll"/>
  <commandset id="tasksCommands"/>

  <command id="menu-file-close:command" oncommand="closeWindow();"/>
</commandset>

<keyset id="mainkeys">
  <key id="key_undo"/>
  <key id="key_redo"/>
  <key id="key_cut"/>
  <key id="key_copy"/>
  <key id="key_paste"/>
  <key id="key_delete"/>
  <key id="key_selectAll"/>
  <keyset id="tasksKeys"/> 

  <key
     id        =  "menu-file-close:key"
     key       = "&menu-file-close:key;"
     observes  =  "menu-file-close:command"
     modifiers =  "accel" />
</keyset>

<menubar id="menu">
  <menu id="menu-file" label="&menu-file:label;" accesskey="&menu-file:accesskey;">
    <menupopup id="menu-file-popup">
      <menuitem
         id        =  "menu-file-close"
         key       =  "menu-file-close:key"
         label     = "&menu-file-close:label;"
         command   =  "menu-file-close:command"
         accesskey = "&menu-file-close:accesskey;"/>
    </menupopup>
  </menu>

  <menu id="menu_Edit">
    <menupopup>
      <menuitem id="menu_undo"/>
      <menuitem id="menu_redo"/>
      <menuseparator/>
      <menuitem id="menu_cut"/>
      <menuitem id="menu_copy"/>
      <menuitem id="menu_paste"/>
      <menuitem id="menu_delete"/>
      <menuseparator/>
      <menuitem id="menu_selectAll"/>
    </menupopup>
  </menu>  

  <menu id="tasksMenu"/>
  <menu id="menu_Help"/> 
</menubar>

</overlay>

=== Added File Packages/MoZTop/laguna/content/laguna/userfolder.png ===
  <Binary-ish file>



From srichter@cbu.edu  Thu Apr 18 05:56:02 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:56:02 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/laguna - contents.rdf:1.1 installed-chrome.txt:1.1 laguna_xp.gif:1.1
Message-ID: <200204180456.g3I4u2X21451@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/laguna
In directory cvs.zope.org:/tmp/cvs-serv20598/laguna

Added Files:
	contents.rdf installed-chrome.txt laguna_xp.gif 
Log Message:
This is Scott Robertson's attempt to get a Mozilla frontend built. This 
sub-tree will be short-lived, sinc ehis code will be incorporated into the 
other one asap.


=== Added File Packages/MoZTop/laguna/contents.rdf ===
<?xml version="1.0"?>

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">

  <RDF:Seq about="urn:mozilla:package:root">
    <RDF:li resource="urn:mozilla:package:laguna"/>
  </RDF:Seq>

  <RDF:Description about="urn:mozilla:package:laguna"
        chrome:displayName="Laguna"
        chrome:author="Kevin Milden & Scott Robertson"
        chrome:name="Laguna">
  </RDF:Description>
</RDF:RDF>


=== Added File Packages/MoZTop/laguna/installed-chrome.txt ===
content,install,url,resource:/chrome/laguna/content/laguna/
locale,install,url,resource:/chrome/laguna/locale/en-US/laguna/
skin,install,url,resource:/chrome/laguna/skin/laguna/



=== Added File Packages/MoZTop/laguna/laguna_xp.gif ===
GIF87a X÷yyÊÞßÞn‘–ii±qq¾ÑÑÿ™™Ö22‡ÃÃÿªªÿnn¸ÁÁñe²	{zÆææÿrõÝ••ô†…Ⱦ½ÿVV§uuĽ½½¹¹çÿå¦�’¦­­ïbc«®®Úÿÿÿå¸Jçç綵ÿGG—��Ädÿᙌ��ŸéFDD«ÚÚÿllµÊÊþǘ.ÿۃƎrrÀ99•ôÉc££Ûhh®¡¡ÉXY˜É¤Zbb²ÿ··ÛÿØ{ØØ芊Îë´0
èZZ´ÖÕÿÈžHÏ”ÊÆæÿÞŽ’ÈOzzºÉÉû‹¦ówwÇ++lÌ­wññÿpp»bb¼é©Û›llÀ¥¥¦óóô¬ûüttÃ˳œôÖŒÈÈÿ——â{}|ÊÊü<>>¥ÇÇÈ¡¡ñ7m^ªªà°°ÿiii`a À¾ØÝÜÿxÛ
)T…ûÞ˜¾¾îhh»MM¬pp³££ã§§ð Ì—ÈÆÛª«Ô+IèÛÇ�wx©è¯_ðÝ°AA’^_«]]¥õÓƒÌÈò””ÒÎÎÿ¼ïyww½ÌÌÿ¥¥ÙÑšooÄßÞÿ¤¥Á¯®ÿmm³öÐtÝ’=Ç’››Ëss¹Ru‹††á¸ÇüÎnÔÓ÷/ÄÉØÛñÁQ«ªö«¢•™µåxwÏ,˜�ž�ê¦Âø÷÷øÎÎùÉÝÏÇ•oÝÜí²²íT;;yK‡
ÕÔùRS�
¶€�µooºÅä±ÐÏÿå£LÐÒåò͇€€ÉÉÌÿž�ßff´%%€ÇÇúÑÐûÈàů¯ùee®i€ÑÌËûí»m{“ÖÊÊ÷ÅËÿOOœ³³Ánn­——»fi¡ttËðÆ|dðssÁkk³ÛÛÿËËÿÍÍÿÞÝÿÞÞÿhg¬ØÞÿÓÓÿÎÍÿÙØûûÐhܧ'¨¨âØØÿúØ…]]]ÆÅÿÆ�âáÿËÐóÍÌÿ±±ú¯¯Þ´µìÉÉÿÍÍüÉÈý=…2K»³²²îîïÓÓú¼„Džž×ÕÔÕ@Y°hi§=jJ‰4™™š��»Õ'ïÍ‘��ÔººóPs°¦¦ÍÌÌþÏÿýqsª­©ØÆÆ÷©ªÉ±±Ô!ù, X@ÿ
H° A$H*\È°¡Ã‡#JœH±¢Å‹3jÜȱ£Ç� CŠI²¤É“(Sª|H¡¥K
ÈBl™IsË(R8IÑsŠÔ¨Q5·` •Œ	2—.’áëÀ´©Ó¦^JE«jÕ
�HÝJ�
d.Â:JŠY5³&[¤£):!TQi颉]x}@¡@ ¯ß½\]BYC¸ð	5ÔœXÌøpbÆ\"sA¬F²å½M,K¸³Kš¹œðÁ·1ã&\^�Ú32»°íòÜr.„XµR°j5BƒÛ"ì>ÖízÈù(çc‰�çÏ×­‹@¡�ôرS‡(�µïÖÀìÿ M¾¼ùóèÓ«_Ͼ½û÷.'ÔKŸƒýûøóëßÏ¿¿ÿÿ(à€ÀV“G i,£‚F(á„VHa-ý„Ã0À€ 
 2‘ÂÀL`â‰(úDÓ(w èâ[ŒñL
L€¢Ð@FS�4âc„Â:XQa#2¤ÒÔy¸ÂÉäáOS©LÙ�¹ä²�ª0¡Æ—hÍbC.ı£òà‘
 €_y©áæ‹È™Âj…Íbãž{Ιd6`Ch\:(/$š¨ž6(ê(£Ž*ª'ˆ‘&Ꟙ* Yc—*pžkªÊ/Ê©J^xØ j
01Ë,`¦ÿ €*!2Tüá¦|ºKpÀúF2Äí€\=>"³ÜrÀBÀÐI'�³Ö­“�v4Ð]wàEÀë·à†+î¸äb
Ÿç‚˜nº¬k£»êÆ+ïžð¶n½æž»ûª»î¿þÜ.Àܯ¸¸Q®�õ=åp4uŸÄS±ÃKÌTÆslßÆ?•±Å²~§¬òS
tPAû½\A}
ðy€Ñ(SÀ¾ûŽÀóÏ€Œ 4Ï>÷<4ÑC}´
p Â
|¦ õÔlÀâO?%Q&\wí5&Ũª*)[œ2ÆH�c!Ný3ÆÛoï“J*q¤ ƒLIQÄyäÿñ¶�ÁÈ3§4…ƒ*ˆ+ ÀR2å

�ç‘ö,YâáŽàÐ70!ÞAi@ç,S—^ú,rÂê6¤`Ãê°³îú´×~)àQ鸛nºî•¶|¤­K½û)p|ò¶ÓBÉǾ:0¸'“z‰&æ’B2&ö½&i»>f.¯†ï{é
ü¡þúE0"k¼UõG
ªKÜüçOÍȲ|<×@
Ð2€´¦@i]¼Vvþ—¿:ð�Œ 'HÁ
Zð‚Ì 0vPÁ†­ìƒ ¡GHš�e.“™
UH3ÓÝaèG-Œ ‚Úð†8Ì¡wø ~¤Ái©¸ƒéÿ@Ä"q2x†–Þ¹&:q'gËÅ3dpÄ*ZñŠXÌ¢·ÈÅ.zñ‹`£ÇHÆ2šñŒhL£×ÈÆ6ºñ�pŒ£çHÇ:ÎQ�÷ÈÇ>úñ�€¤ IÈBò�ˆL¤"ÉÈF:ò‘�Œ$ ¿!
IZò’˜Ì¤&7ÉÉNzò“ ¥(
	´Ÿ­€‚°ÂVÉÊVÚá•Š(%Òˆ&ËZÊRiGZÑ~¶K[úr_õpÀ/£Ð‰b3YHf6n¹Ë^þ’™Jãå3ÌZ>àšØ¼æ˜"†xSµÌ¥3§‰4\Ž“œº´å9ŸYÍZF¡è@ÇÎaŽØÓž—ˆ…:¥‰ÿN_沟
Z?ÛYÊ0å7è€*††.t¡ÀG8£ÙÏuÞ²”¸h:ÑIPYfà]ÈBÔ
‰DÔáh€Á<ªðËŒ¢Ó¢u©Fý©ÑŽ–r¸|A?ö…S¥éô™ÿä§Pgi´™öS@XÁ6ZÀÔ¦¶`+à„&4ÑŽGüBŸFͪVŸinü2ì«XÇš…­š•«^f<×ÊVt”à¬p½h\eÙUYvÃÈ«^à‡nXu®€
¬/ë*ËT ˆM¬bˉ
ö±€%¬-!ÑŠV$"¼àE" 
‰yÌ Ð(L!ÙÑîK²@S.�Á3Õ*�µ¤�- °BÛÚÿÚö¶¸Í­nwËÛÞúö·À
®p‡KÜâ÷¸ÈM®r—ËÜæ:÷¹Ð�®t§KÝêZ÷ºØ5®¶Ë]îÁ9¯xs@	 t÷¼èM¯z×ËÞöº÷½ð�¯|ç»Þâ¾øͯ~÷Ëßþú÷¿°€LàøÀN°‚Ìà;øÁŽ°„'Lá
[øÂ^ï
œD°àà ñ‡s ô
m»'Ö@ŠW<·XÅ/>oŠ»ËbÛÆ7VqŽéËã»×¾ή�ik�k eh‡ŒÝxÂÈÊHò~™|ÝØâÈQVr~©l]+cYÊøåru�e0ã×b¦®—Q�eØÿÇpŽ³œçLç:«È.žÝÌg
›"²¸+~p�,C¶ˆþ¥,ø 
iüà†N´¤e),h£Ñ€
=éN¢ÒÚð®°iOOzÑ�þ�'`ÁiSKÔ}ø
’µÌç³î¡Kuj€ Wûú׳5°ž,´ý›ÇNöî{ld›“ÙËv6´ñ‹Kÿ �HÝj£­™=è@}fZ³Ú£
^Àã¶U°Ï�†ûÝ਻å-ïuµŸá@7µAjo¿{¨ôþ6?Á]îiæ;Ýà7»³ÚK�Û–
‡ì¹¾îvCœÜãþ·Ã
´�;<ÞÍ·®PY—¡Â@�…8½÷µt˜0�¹ÌaŽ�XÎ;âõ¾¸KíîfRäß–)°�¶g
»ÏH‡ðµ³½în]°m€.´­
q8ýé�mC¾Au«c²Zç:ª~õ¯Ÿ5êS»×ÍõH`Ѹ†2h­`¶Ûýî¿,zÒ÷Î÷¾ûýàOøÂÿ>ÁxO¼â÷¥÷/þñ��¼ä'OùÊ[žg®¨-O™ÊVzž•h°9ÇÅ}óiŠóòÏl<€KYPƒ‚ˆ½ì�ªˆ(¡×ºÊwïoÑõÀ¾ð‡�÷†[Ü–1PPR±ˆEàÿÀÜ0h�`Äàg™7+R•ªk]oc@€ññ®úÿ–rÃA€�ˆ×ÏDˆžò÷¿üçOÿúß—É7V= ƒP,9;`}@“}öW€ywx˜€
¸€Ø€ø€(xg¥€žGPxwå�ø� ‚"8‚$X‚«÷R›Çaˆ0,Ø‚.È‚5Gz*÷q'ƒ…q8tÿÿF~&؃æA'„B8„DX„Fx„H˜„+Ó2+Ô„3ƒ

à_y°à?
°…\Ø…^ø…`†ÌP?
yàƒ¸�j(Kˆ†nˆ_@è&1ø
2tX1#132Ã1!“2zˆ1xø‡‚¨„ˆ˜ˆŠHBL¨BЄ4ã_7“3;£Næ¤q˜hKLã4ð†¸† È3mè‰h˜‹uŠ¨˜Šª¸Š¬ØŠ®øŠ°‹²8‹´X‹¶x‹·ø_‘PÀ�
Ã0"ŒÂ8ŒÄXŒÆxŒ" tE	¤¨€ät‰ççrz0sÖHCð~Fs4ñæq™88NÞøp;ÿøu£øŒè˜Žê¸ŽìØŽŠ¡xŽî8�ôX�öx�=� (�ù5…Ux…Y†9�	†cX†g¨_þh…X¨…ù�é…É
fÈ_	�‘Y�Y‘ûÅò �ý`ZÀC(™’*iCF€!|`‘TÈ�
¹‘6)�™�
9“y“>ù…9¹_Ù�?Y”[”;ù�Di”?‰”ù’"I’&¹’TY•,é’0¹`ú¸†üˆ_“¨35XŽ9–c	4›ø4ûõ••˜rr•su–�˜–8–Ç'Tã˜q¿—K&’°pµÔD'Š?ƒŒ'˜äTÊ
FÐxjN7ÿHzâÈ{fÙ4h)—”(ƒ:X–n)–û¢—úÕ˜68TÝH–+÷3ž™_ ùRÒ¸qoI™q¹e|é—¶˜³U›¶i›´‰›‡™˜‹©•[¹�]‰_»Ø‹¿ˆŒÆyœÈ9ŒÊÈŒÎÈ_Ãé‹À˜œÒ9�¸œÍè_ÏYœÔ¹�Èi�ÍÉ_Ó;$9Cržè™ž¢Ë@†|Ó€�¼�ÜYŸÈè�òIœÑiŸüY�Ëx�Î9ŸÚÙŸý‰Ÿ
ªŸJ º_á9žå©ž¡ëÙžiðžñé›fÕzÕà
VСú¡%€RÐ…pw‘9yÁI^°¢,Ú¢.ú¢0£2:£+J>²08›š£:º£<Ú£>ú£@¤B:¤D
"*J£Hš¤J*£Gº¤Nú¤P¥R:¥T£ºU5ðAà
0Ð¥]ŠW{ePíÀ	%NÿDQ+§¦§¦>‡¦ gv)Ú¢æ¤4UJ¥6
.À'{Z¤~ú§€¨‚:¨„:¤MꢸĢBs§Qz¨ˆ:Rº¨/*©Šª¤’z©�º¢”J£›Ê¨ž:£ÿWú›õ7§IÚ©�ú©5z£…ºª¬Úª®úª°ê£ŽŠªŸ:«´z«¸š«·ªZuk¹æT¼&ª¦FªºŠ§ª«Èš¬Êº¬Ì*«Åꩶú¬Ò:­ÔꢼšU-÷rÖ8Ã
Þú­�¡9ƒßHTšI®G–4èi)*KÉô®ðú®¾D�ØJ¨�ýDº¯ü:SúªxÿÚ¯[w+íZJqÈ2¾„~+ø‚CÀ­Ð¯Ð®²°m¹™ã§£é˜î–±¤Y° ‹N{w#Ë–¥¹¦¤TÎt8÷²Ýز¡y¢¢9zØG°�õœprгÇÀ	�²�u°vW²B{´Âj´ÿf§´Hëk×ÚO̵}À
}ÐÌð½pð°µå0Uåp½ðQµm§6{±4%™èŠu):a¡€kÝ:€�t[·v{·ôˆNÌðKÌ0¾�ÿPÃ�
àM%�
ÃPÿ�¾�¾4¶dK|l*Xm»_	ëQø_ÙŠ×8s5—`ÑflùºÑFºÔÆl§‹l¨Ë_͆·®ûºV§«;ºýUºúº³k»¹{»ª«ººÛ»þeº´Ë»½‹»³[»ÃKa¹UÛ¼cÛ´’V¹°;½Ô[½Ö;�ЋzDËvL›½ÞkÝûtáû½ˆö´ä›xÛË3—Û
ðK%ð%çpð�@¿çϾoÊ�v©s¼§oü[¶åJŽ+›±<GŽ›y¾²Å´º×sWãû²¥™ÀÜ¿l|w—»ƒ2En¬¹�â(³¾d¾lwéûu|Â,<y+ì´-ìi&ÃO'½×{Ã8œÃ:�4¬x6‡yˆ¹ö¾N¿ó[¿õ¶lL¼Â+¼·ûlN|¼S\ÅPœ¼Ä[¼©KºÆ»º¦ÛÅV¼Å;LxWìÅ£«4}÷»À{¼Õ–ºÉûÄn¼»¶ËŸk¼­»»fÜÄ]ÅwLÅÖÃè;Æ‚<È„\ȇÈ<h`x÷ˆÜÈCÇȦÉŽ¬Qÿ3<É�–€°¾LѾ¿”­zðysP
è½ ©pG´¨U¿gÉ®P’Üi/Œƒåh|㊱™˜®ŽkËq‹q4Âg»/•üʈ†É‚uW¥°ÌËL·`K±œ{ÒhÌÔœ¯‹ÍÕÍ8›ÍìjÈÞüÍàÎÌÍÃê`šÜ
™ë_­÷z²7{MU{J0·ÆXìÇÖlô,Îú܃w\º­KÏ¿ÐxÌÇÄ[Æ-Æ^ÌÅ¢kÆqœÏ
FÎåÜ`çœÎý…~êÇ~!æ~‡W§½ÏýÑcÑݬÈ$+Ò&[Øœh)}ÒÅ|Òp…ÉýK­7^âU^Öl‰“+–­¬KfëÒÿлÒ
SóÖpB÷¦ÿKÔHÍÓlšÓåtÔåäsæúÔGtÓ<€ÛìÓ�ÓA̾�¬‚b$ÍX=ÖgÔ(=S;}²sõÀÂ×ÒdmTÈüÈo=×þzÍtMNn}×ýôÃ÷¯~�F¯è
JÒ†}Ø
ÖѬ‹Øû¥×€Åׄ0ÑÆ°ë°Ÿ;ÏoÌÐZ¬ÙÈ;ma|ÐöÌØ¢]ajìlhm¥-Ŧ}ÆtŒÏÁûϬMmm¼ÇYDzÝÏæØsÙ£ÝÛ¾ýÛi¨Û/}`€%Øöš�7-ÜÊ�}v½Ü¥”×Îý—Ä�°[½É]Ýa•ý‚1XKÝkËnyÀœi—
ªi!
Ý*ÜÜ((¨ÓLÔœƒ$œ4k›™*;³ãêÝj}³ˆgÞp=ÝE«ßÊmÖ¤àäÿÝþ-ŠÀ}àžà#Xà•¢ ?ÐÑ Õ“vš^	á^QL­¶yéšüõà>á-µáfeáa›¾T[è”›ýT(À
½™–.âÒg[p&~_ žáNXë”ã;NãS]ÞuÉ3@>㾧Ë
•ã
€ây—›,W.ã6Ìà
å൰?À
Cgi•‰šY¾å]þåa.æZÎåfeÁ¾äå`þš°É
}	lÌðÜ€ËÀ˜c®æ¿æægî•{Þ{fåçp®ã�ŽÖpEèiyè}næ…n£Nîku~çyNàÎÛ
žéš¾éfå…éœê¢>êæçé+Nꨞêª~Õ¦Sžâ«þê°ëúÕêäê²~ë¸δ>M¶žë¾þë;¼ë©ìÄ^ìŒ-ìhìʾ캎ì³ÉìÐí‚ììÏ.íÖ~íÔKíÒ�íÜÞít«ílèíâ>îÿíˆæ~îA!£�îþîðÎîw 
.@è~ïøžïøñS ïè^^q0ofaïO±qƒ€È'xñð? H¦±j€Š±ñ_¡�ñ"¯ð(�‘aM€T°ñkÐòT*kÐñO

ßj@ñ(ŸÑÿÎïU,°�Å¢EüÓ?�Ñ1@M
Ô;@á
X�õUßó\ßõ^ÿõ`öb?öd_öfÏõ.ðïg¿ölßönÿöp÷øŽtO÷�[Ð<w�ÂÀ~ÏÂÐ÷ë6Ñ<e#mR÷ŠïŒ#ÿNv%4à�Ð
è@8à$–¿)�càmÁ¡Àx`%£øv¿��
PúM
¨û²?û´_û¶û¸Ÿûº¿û¼ßû¾ÿûÀüÂ?üÄ_üº±�üÆO÷ûüÍ�úÏ_üw°	¼΋xýØ/„�è„2C3¨ýÀ
WX{+[ZðCOƒúˆ“8É�¤&_2
Xó!ÿöoÿ¤�c�É0+¡`@R:¥JáÂ
©vÀÑ �‹…)6{‡†«ƒBøðiÀ„I²<þêH‘R�*³\β‘ËF
U)lLó°ÃŽš>|N:a–ªdA�®Y3tR¦ÿH‡.„ºÐF.U­ÚPeÃ*—]±Úè¶ëP°bÇf5{VaÚ¢¾M¶5Ä\<5ç†hŠ5S£Cøô�G°�d,m¼œ5 ÅJ–ªDpÁˆÀÛ¨L`]†AóUv|½£Açz¥?~ýÇÀjÖ`©ú³Nöìu¯ÿÄÀ�;P ”}ÿ\ø𷀌Wxêq@™;G=úòäÎ)?W¥¼xóìÜ£÷^útìÝ“s~gñ…Y0èÔù¾üòéÛH?~~þñ×çï¿ùöпþôÓ>d°ƒ:¨ B	'ŒÐ½¢:Àˆ”)€¹<4îÃGDÄI<ÑD@ÿTX€ˆ*gLfž#‰-Ôp¤GüQ�-’8…†1ž‘a—<¤'Ÿ,b¤%™d¤J+9$šØPà/IAÆ
ÆS†$kÌe5ÕÄCÉ
ðÈ#N9sIF£‚¢sJs
˜»æÚ ™
þ¼£P<’Á£PE
E”­<ô¤1± 4Ð<(Å´ÒÙš ™\8­sQE;•áÏ» OUût£æ¬�5sÉåLHeLÁÊ?vå,™&‹�3F|Õ¬ØÍn•‘‘Ó–-"FZc­
gi›
–isË­Yd·å¶[o¿7\qÇ%·Üps‘Ò\u×e·]wÝÍ#„2¥·^{ÿï½÷…Õ_ÿ8`�&¸`ƒF8a…f¸a‡†8b‰'¦¸b‹/Æ8c�7æ˜àe>d%<@ã“M&ÁƒBf¹e—_†9f™g¦dQ~�9�wÎ"›lj:h¡?¾yæŽFº1ĺi§Ÿ†ºhš‡ét>ˆâ¨·æºk–¥ö:l±ÇŽì—‡©�Î9'€N*†l¹çÞÚlºïîš9½Wp"D†<p;z9æ˜z�£ð#~ÑûÄC!r?¤Üq�3qr'—\óÆ?ßÁ�Ï™‹çÓOG=‹Ï5ç\ò+WE[�|t@B}
Ýw×]ã�uÈÿ]¼òÕ1ï|sÌ•·<ùæ�·÷ÏW1Áë­7AT¶GeqÛUäÜCçc¿<s½c7¿yæ3'_oéÿçAÞ£ƒú—Æÿ |o_}ÿÓ_ÿˆW"⥯sž«�íŒó¾Æí”àEêðŠWÔ!­ˆ`"æ

BDì»
¸<Ù��}#¡çf÷ÁÞNtlCçhãÄPr3üóÀå%P…*a[8D"шGD¢íС$6щOÄ¡8E*VŠRüÜ'VA.rÑ·°bŘD,ŽÑŒg´bѸF6žQ�m„c½0G:ÖÑŽwÄcõ¸G>öÑ�d ÿ9H;6o‡Dd"¹HF6Ò‘�„d$%9ÉFjÀ’—¼ä
x=œÌ“ŸDƒ"0iÉÈ‘r—ì&S©�Ž²”£d¥äPyJSʲ–´Œe.a¹K^öÒ—¿æ(@bÓ˜ÇDf2•¹Lf6әτf4¥9MjVÓš×Äf6µ¹MnvÓ›ßg8Å9Nrz3˜çDg:Õ¹Nv¶Ó�ïÔÀ0¥Ùy–ÓžÎ4EdqVüeh!èG‚6®
;@€7¢q
et …( dQmHc¡
}hD	:ÑŠ^´
ÐhAšÐ‹4°éF)jQ†ôžÇLiLeÇzBó£ÕìNG êSoæS˜�® ‚eX|3eN-d±	 
UCä¡ûWÅüAj�*Õ0VWuªQC¨À©†Q©?ÅêS¡JB6–•Œ²h?ýY{¶°}±«�ªá
+ôÕ¯í«€ À
ž�H¢[‘êÄš>ó¦/…l6óùÕ´u±kÔ,ÜTmˆÃ²OT,R3[	Îzö²–ãhKûÙÓ¦V³«m­a«˜Y{¨ þt)7«Xƒ'Á0np…\ÁÆÖ¸Plld•»\æ6׹υnt¥;]êVךÇÅnvõ–\ëv×»ßoxÅ;^ò–ÿw¹UYÉ<™²h×½Män3ß;_úÖ×¾÷Åo~Sj
6„@T!`ƒ5>§Û"N•o~\‚Œ
E6…+„ðXË·CˆÇ�/3§IN’Àñ‡‡Ð`ðãû
MØ?!ê×Å/†qŒeŒZÚ!�­Æ¡
þð¤?ü£ÿ€Ò˜@æxÆGF.5‘¼d&7ÙÉO†r�e*3'ÃæÅr–µ¼e.wÙË_–o�m·JÂ
ŸDóBYâÊÖˆ‰uò•Á<çeòÌÎwÆsžõ¼g>÷ÙÏt =hBÚЇ&´3ÁñŒh,Ï�Í[E!aÛhA¦5½ém¬ÿp¨rLå,iRÓ=ó™_‚Ô U·šÕ¯&¬_­jUËÚÖ·Æu®u½k^?äAv,´ÌEƒCve1›Ç" Ôà
u´
1êgÓùԽƶ«k�mnwÛÛßw¸}
¡`OhØÊ|AjÁÚ6.£À‡<^Pmï"»xxõ5x ~÷{ÓŠX�„�Dò…VÚÇ¡6½¾p†7Üáÿ¦½a»ÀÇxÆ/ŽKX„l…Þ“íÁáýä-nmÂ!¾r–·Üå/óÁ«¬rd.ºÑ£×£#ÝL›ã<ç�~fÏ}Ž)�?s
ˆ€D”¾t¦7ÝéO‡ºÒ#`€�ÑC'ÿ:Ð}u¬ è<ç:Ö¿ÎL¡‹]ëÌ<zÒ£¾v¶·}êUצ̩LsbûØ:Œ#³_„L»3q­7vsõîl¾ÁØ~žÇ«8ød6@X€ZGRãP¾…–7â†
`îö=ñ€|èmÇøÂ^Ùaìé�éùÓW1õ-Úû1YÄ_Xð°'¼1yÉÛN"7£æ9�M¹G™î„H÷º‘ênxË™ÉgwH™ïy?_ÝÑwâ]‡8}ç#3à@´ SfÀà†`‘Lè/ÿÝÔgÿõA[EîWߘíÏ>ýßßýû˦õ÷>ð?ò3?ôS?â«¢=¨
LÛ´‚�+ÿ¾�:>˜£À
´ÀÄ@q²"C„#
K¨v ƒÃ9ï	¼3 ¨ŸÚ1 Û!ƒƒ¨ã#¤$BhÀÁÔÁäÁôÁ Â!$Â"4Â#DÂ$TÂ%dÂ&tB$”BAŠÂ)´Â+ÄÂ,ÔÂ:BÀ5Ú"C"ðƒqˆ@š¢&<Š;ê:JC/hÃ
=¢�ÀÁ 
<²Áì<ØC>Ô	@D?üCyÂCDÄDTÄEdÄF$Â.�)è"¬Â;: 9jCLŒCM\C>šÃ:¼C=ªDKÜÄ:ºD7”6,ESÄDMtET|Å7ÜÄL”ÅN”Å-œÁO$;Üÿ£.,Ã%“A\ÄÂ<tÄb4ÆcDÆdTÆeÂQÆ+tÆg”Æi¤FBòÅ)Ê«½¬m´‚â’)D,™:>ì"„_4Çs$¢rÔ.uDGr¼¦0â-ß.àR‚a€†{ÄÇHƒà),‘;9Ôú¸È Ò!È‚Çƹ¶	"33K3Pê¸
k³ÕI¬rÊiÐ9ä9!ð�³vI#bGr³­º1ís°HbÁ‚<ÙjAØ)1ÛãÈ"{Ç‘Œ±„´¢J»´Ì4u°Ç��†,ÐGŠÔɤ4Ç’<.¦TÊ™ºÆ*â„3€xøI8I Êwà„|xJ*šÀ˱$˲ÌÿÀ*bf_è‡4À�ø‡(pp…`ðHƒ~د̡`ã)¸”´1�l³ÀtA“C1
ËcZH	€fÊF¾âÆ¿RkÚ©{ºL³ÔÌÍ”¦È9¦Ë”cÊÌÏ$¦ÌÍb:ÍÒTÍÕ$„ÑlMÖtMØ”Í×\MÏ,ÍØ4MÖ¤MÝŒ8"JËßδìV NV胴à´åüJßÛ¦,€è”Îé|LfŠÇßšÇá¬êŠMÎôÎïO,kÎüâÉØrÊñDÏ&;ÏÖZÏô$¨¨tÏì*Ïãp�T³ÏùiHJš`›sè€s¨ŸƒƒZO8Ç6š*è	GÅ[#›ŒO3jÿO‚ƒPÚ;Á¬=�\ÁÅPÉ­½‹¼ÈÄ\±­1”;ø|PãšOãhLøÈOÛÙÏ£‰‚þd›(
MÑ):Ð=£-¬”,¹0ŠP²ZP4RÐCQ½¬½¬!UÒ'5Éu„Ò8JÒ)µçä³fÚÏþüϵŸÈêÎo
ÓR3Í1
Ï3EMj2S4}&+�­Å4¦Õ‰ê\¦-�¥QÕ¦ÜMÛlÍÐL¦Ñ,ÓAíSÚäÓ?õSdÊ)ÔôÓCõL×\TDeÔÚÔÛ´Í5eS{:Ô4�ÍÝ\®ÔdÔJTH�ÔJ•TKmÔe2UAmÔEÅMÒ„ÕÏ4UOíM7]ÒLÅÕ\Õ*Õ]})[=-&í³Ê« ÖbÍ
J,ãÀ
v€xè¤ôÕh=-'…Ji…ÿÐœ´Ö+�¦Ï‘S_k¡C�ó0
" W?È„í1Á%Ò#L¼ó¡Ó3ÑlmNj•){íÈ
uW”cÉ”IãñŸ€
�Cy+·ªRzm#&],|U؇µ"‡
)‰…ØÑIØŠ5#8åÕ�åØŽÍTŒ�ÁçÜ6i&ÓôÀ³LÑäTPUNUUÕtÙN}Y�µYé‚CÞ¤Õ–�ÕÙtTÒ<Í™e¦MÝÙÔ|Õ¡eY
Y‚ÒØ›uÚ§…Ú–[Z¦U²¦œÚ«R÷¢X¬½X¬�"`Ù“�HOZ3‹mWKAû<€E±õ9R¯E²­…(jå¡‚�I€DIÄ”À¤°wÿR�4ŸxQ
=½éZ¹e¬ª5.ºU\¹uÜ÷|ÜtÄÖÉ
£¦�ÚÌÕÜÍ�3Ë#ÌíÖƒ SezÈ3+[“	¥•íSGÕTMT–uÙV}ÔD�Uε]nzYH]]AUT˜Zß5ÔÝ\UYí]Ÿ}Í�:ZáíNL­\ÏËèÒ
Kc@ Ì´Nv¸ÝìÕÞíM&ç½\Æ5OïßƉ\*ß
kÞóM"°m±ýœÒ=]Ô�HÄMÛá99í¡dû!ÕÈUß+_8ÂW€Õ[ÅSÉ~5Ì�ä[•œ°¢I7sÐ�DÜôý_#VêÄàòÉé¥^ë5´­`ï
à6aˆMÜnÌåÞfáÿVZ>¢ã<p€%Xôs†2P†æáöáâ öa@
œy7p†@@¦®áæ†â(–b)&b#¶$Vâ%¦aÆažâ/ce¨bæÃâdJXð³€4X€6vã7†ã8–ã9¦ãHƒ4°Ø�4H&&æâ'öâ0ä ã#Nâ>Þb'†âAfä!.b2>äcòcEäFnäB¾âH6¦IîbKödL.ãc:ã4æ€5®ãSFåT¾ã<Þã†a„£¦Ù¹·}Â=1âQ½bš½¹¿5¢\Öeû»Ï«I˜T,`&¦Ý‹<Z:„SºÊÃ<ËcºÚ�h¾ÒÿæЫ±Ù¡åZ6ÜK¦]†ÉCL”ÔdçwÝ[”à
gÙfÄ#¢rn"dVæÞ›¼Ê›6}ægi†æg¶�j¾æëze®¦"`Pè…fè†v臆èˆfè8À†1(eBh‰æèŽöè…¦h‹ÆèeÚè�6é“銾èŒV¦àX€uc…ˆ†š¶é›ÆéœÖé�Îiâppˆ
’Nh”6j�é•&ê£fj‰Nê‘N¦’nê©žh•†jd’jª¦ê§fidri˜–išæé±&k²öi êl*hƒvá¶vë·Ž¬µ."†ëº¶k»–k"¢ë»æë¾æÞ¼¢½OöëÁ&ì¨ìË+ìÄ!
Vìº>ììņìÈÏÆffɶìËÎ\ÊvNÌæìÎÞXÍž<ÏíÑFSÐþœÇ&íÔVm:3í^í׆í
lííŠíÚ¶ÿ퇀ÜÖíÝÖm$ *ÈR…QØ‚-nRÈ&p
* $àíç†îè–îé¦îê¶îëÆîìÖîíæîîöîïïðïñ&ïò6ïóFïôVïõfïövï÷~o$�ïùöm
@I‚üÖïýæoý’d`d €æ–o*h‰
 2Qðw
úvp$ÀŒð	p* d@†A ß„A€‚‡5€–X	`núF†&Pq÷‰A@Œ‡‚	§o(h
¦P$Pƒàñ?�ßñ·
 ß
«˜q5(òª˜qgrúv�"çñ&@‚Aðñ—rd¸q¤�ò&§‚_q5pÿñ&÷íù‰˜ï/–�ïÐøŒz€ç6�eysh�وǖÜØ
·†>ƒ?ƒ=óA'ôB7ôCGôDWôEgôFwtù¶�7ôI§ôJ·ôKÇôLŸpçt* á&…Põ;†Tˆ6ß�8…âfõPR�
0ñNïtdP€<pˆ‡HNG†‘H“5I`„¥c‚_Ÿ•
Pp
‹ØÁpvtAW<À�ƒˆ*P@‡‡'€&ˆqŸ€*„p÷�	wZ§u5¸qW*ò*÷OòyOr.x÷&¸÷wW÷~÷÷A¸w ÷*�rOÏò5hçÿt÷rOw…¿pæ&ðøm
h€¿Œ`îb	
�G‚Òˆs>€…
çhA:*hjÁ�ko€Ø�@èsk¸vˆ§ùš·ù›Çùœ×ù�çùž÷ùŸÇùÀ�]q3ú£7ú�5¡uÁhâNöä(e`ÀZWve'xõUé“	�ÁÈâfõ$àú>î1@vȸz` 
“x>Àz68@X €«W€}0ˆˆ’…ƒÀ
&Ø2xˆ"€{XÈ €WƒÇWƒYP�˜€üèXHvU0w€ø‹;™5p
ÏrÒ_ûÔw�Y x.˜…Õ¿wp
­¨ÿ÷ÙgÒ/³@}«ð
ÕO} øø}U8xÙg‚;ñ	Ò'À°�ç·�Ï'ÈñW{ÈÀp‰Gà_{d0Í
@Ðy7_îea
Xp�0jY‡Xÿ<wyøo€˜·@‡î×ÿýçÿþ,h�  ƒ
2˜°!Ĉ€F<8ÑàÅŠ¸Ñ(0†"GŠÄ`ò$É”*WªDÉòeI˜N†Œ)sdÍ›:IèPá'Р?A(x@Ë�fÑ&2átÓ¨M¥R�
•©ŠD(Èä+ɶÃcö,ž	I¶°Ý’dÚ¸f�m³!™°)Æœ
5ÿØ°¹R�ÄÑ 
²À2hŒÔAÕÈ8ÂÈŒ\”ÇßÊPªÔÌêì9¯<û¤NÆ$…�Ô©'LPsš5ì	kf1I¶æ6îÙ�wµq"—àÁm0±!\øâ6^0oþ‚örçÌ¡KŸ¶ú‹	¼w§8~â»�Ó!Nä^C\ÁíØh+P}ÖF
&ª<ÏR“,E^ùLp�ì
ÛF,Fp`ì·ƒ
ÖÓ.ÔÃ…ÂÂÄh¨á:ë\øG‡Æ0bL40b )¦X¢€-ºø"Œ1ÂÈn4~e£�LàÖŽ5òÈ[�:ù#�99Q`Hêˆ#“76¹¤“@>é"G2‚Lÿ9Í„“M[ÎDSK)Õ”Ó˜]ƤåJ&q‰“KZ¢¹ÓM=u’PDív€Ñ(S@UN5õÔU�:ÑUSa¥W»)°è¢É<³ƒÌ(•Vjƒ¤™jºé xlAÃÏà¥@.4ÐA’Œ¦�Â}Él@YèÀ¨)lp
¬�°ñ˜H8Ð*Öe"éð+­ÉŒ‘Ç0ø‰ÅIû,´ÑJ;-µÕZ{-¶Ùj»-·Ýzû-¸ávË­äŠ{.ºé2B=Ùb	g˜ð’ô¦¼õÚ{ïJr
µ/Q¿PË2?°RÁL•iÄÁÕ¯«:Ìêb£�Å[|±Ål�b—­Êð�!‡
Éÿ%‡2²ÃÉ0‡+èˆÔI(ÿÁ͇¤22ŒrH2Ì 2Ðd$“Ñl€G*-¿¬>¹ä‘‡) k¹<|õª¹T×!l`k×\ßq)à16Úc—�vecý0ÛÕ}�v_¯ŠÝ)È€·Ôi£�÷aw�‡ÔOðõÔ¬=�Q»j4ѹpßÛBó™ÿQÄi‡qX�2‚‚îðGå3R!ëE¤ÀȆ®ÓÀë!†,)ü1"ï#ºž:ðÁ?<ñÅ<òÉ+¿|åyÐnü»øJ?=õÕÃIöÙcÖ!°Á
øá‹?>ùå›/~øˆ0Ì!`=üÿñËÿÌcŒ±Ö(!@1ˆ#ŽE$–„S€Ê.Ï�ãç¹"0°�lH _G³	²á“cCw¶³žÅO$šàg´š%„2XÜâ& ¹\P
€ ür!8®áaxèZÚjx6¿Ý! [u|CøåáF<â
jXD$±†ðc¢�1€\àmŠ<¼Ã¦8ÃøPsád ž§IΆx€ц?•M�™{àØX0b)€EéTG5²¡jÝV;
!�°]‡
ÉD&R�Ž|$$#)ÉIR²’–¼$&3©ÉMr²“žü$(CI’²”¦”Á3žQ´ÿ¢1•§|%,c)ËYÒ²–¶¼%.s©Ë]ò²—¾ü%0ƒ)Ìa³˜Æ<&2“©Ìe2³™Î|æ)AC"
Ö¼&6³©Ímr³›Þü&8Ã)Îq’³œæ<':Ó©Îu²³�î|'<ã)ÏyÒ³žö¼'>ó©Ï}’ó
Ú@@*Ð�´ =(BªÐ…2´¡}(D#*щR´¢½(Aÿ)t¢%°FC*Ò‘’´¤&=)@Á‘�d¡3@)Lc*әƴ`5ð5x ˆ�ò´>m�"V !¬¨F=*R“*g,
*ɆH²‘Ô©Rõ`K-jT"‘ˆ¡ª^ý*X•ÊÔ‚ù#ÿfý>²ÐÒK<"a}+\ãzÕªüCv½+^ó*|ĵ¯~Eê\	–�.°£ý˜J€Ž(X⯎},\+•d
L¡ìS,ÙÍ&u<‚H ÚÑŽ–=è�ÎQ0¨êO…j- 
e(×ÎvP„ò¡b+ÛªìÀ
‹:‚+Üá– O±Íím_‹ÜÝ×*ÈÕ-s£Ò[‚= ºÖ­®>T‚±ö¹O1l©"Ûï&—µ¸…®r“[^õlºÃA<º€
dA§½ï~±Z粺S9/x­r^òú×»ëEo©â^ªü£8mðá­nµ|•JtûkÛA™WÃâÿï€	\à掘·¾%Ø. Ñ
D¼¢‰¨ƒÐÀ‹VÔ¡�ØÅ~?ì]?m8Ä<ðl1`ò¦·Ãæåq�M\TYŠö˜“Ÿâä�—À¶unw_;`Ý&ø¨+pB`À‚1“æ@šÓŒ
]èÃ20œÝ\Ûå˜ÎF]0Áâ€=ó¹ÏY0îmãœ^9×yÐ
>1U 1…)èƒÑúxt'"-éâšË$t†/]gMs:¼žNò¡«Ò
?˜¡Ô¦6ƒÊ¡	Md‚¯œ‹Ì]þ*·Ö›þ4‰AÍ<Gå]øÒ„#,l»và&tsemç\+›¿sîô¦Ÿ«ä‚)a” Š"\Ü
^ð"óø6$ˆZifÓ‚Öñ²?Ýìd#»`¼–Êõ‚Ã"ÞO™÷«i}kt§[Ú†Žë#8Á‰G´™³7˜5Pp°D¡áøŸþÖ„5
û

¥%®q¯Rœ*£.ÈC^
?¸bã&kÇO®r‰§œ`€D"¼=H¨X9ÎÿÚòœóÿ¼ç>ÿ9Ѓ.ô¡½èF?:Ò“®t¡C éN:Ô£.õ©S½êV¿:Ö³®õ­s½ëPo€4Ã.ö±“½ìf?;ÚÓ®öµ³½ín;Üã.÷¹Ó½îv¿;Þó®÷½ó½ï~ÿ;à÷®�Ážð`Â6~úS ð£ðŽ<ä#/ùÉS¾ò–¿<æ3¯yÉ7@žÿ<èC/úÑ“¾ô¦?=êS¯úÕ³¾õ®=ìc/ûÙÓ¾ö¶¿=îs¯ûÝó¾÷¾Ç½ä�à�jxÀ
Æ?>ò�ï
 <P#ؼœyç?_òÒwüõ¡¯ýís¿
„ø>øÃ/þñ“¿üæ??úÓ¯þõ³¿ýî?üã/ÿùÓ¿þÿö¿?þó¯ÿýó¿ÿþÿþIžg
"�–
Ž6(Bó

á]ŸVßN_õ^F^ààQ_N ÷u z† Ž 	– 	ž 
¦ 
® ¶ 	ß�À
Ö 
Ò ¬€î ö B²_3¡òŸ)Ä@ôA4ü
”A3€ß.�WµÁÔB
üÀ5(Ã~_J!UQ¡
\anazaR�¡j!!”¡Z!ªá÷™,´áî@Æá¢àö¡þ! nª_bößÊ°–�24€V•,Ôƒ6HC4dá#F"UÉTâ%¢$ÿj¢Ru¢%þ@,ƒ(%Zb¦C¦âQq¢'^ƒš ,Þâf"úâ!–`"^�4À¨*\¦mœ,`�6xƒ0£Ñ#U‘ƒ,È‚6`c1
4Fã4b‚\£3òÜ6¾U2þ,`ãÑ1×8V…4Rc4âþ.Îã_éâùñ¢û9ù

ø9ß÷ù#!ðã?
$@
dü!€À7¢#\áš²…d-€
l‚B‚ãÁ™¹AÛreäºQ•=LdEcU
Y³u×FîÛ:ÌGRäBª@Cê[¿qšcI$KZd¾Á$l•d I›Fþ[Q}¤,b#Ê#\ÝT%Ræ%ÿ
=š¡=š>¶Ÿ>þã@Ve@Ž€UNåUöcVbåVŠŸVÒB†d8~Õ�ÑÖ³i\84€H€hƒHòOZ™ˆY™�]š�½•(°¥[jƒ8dcQ]Y‰Ñ%nÁÚN¦äQíe[¾å_‚Õ•aaJÜZ.&\º$w‘dZj™¡Ù¥�	&Uí¥(ˆÃ¢@<Þ_`¦åD \k¶¦k²&(‚\Ž˜fjæí–IÚæzÕ%�	ÝS–_TöbŽeKfSJ…5ÀB%|£_çqFErâs6æsREtN§s>gr.'4guVErÚƒ
\¢ÖßiÊå— ™­'{æ€l¶ÛCî[®9[a¬Ê'»ñdÐý&ù§p!q^£8ˆƒ
(�¨�(‚&¨‚.(ƒ6(‚¶
,HçB
¨ƒV¨…^(†.hDÀ7ôåPh††¨ˆŽ¨�nh‡¾å‡’¨Š®¨…B¨„(‹Æ¨Œ&(J@¢€2”�ŽîèŽ6ƒ�žßw)Rég©‘)’&©’.)“6)þ	)”‘:)•V©•^)–f©–ji”viULé–†©˜Ž)™–©™žÿéøy©š2˜†ßš¾)œÆ©œÎéÁ™æEf™¥1ÅMåOõÔOÕP�älÒ©T´)øQ…x¼&	x@
*¤Fª¤NêÑÅ@Ã)¤?€>,Â>�Â¥†€5H…�¦g¦æg…Ö
༧€ÕggÊgoDÆä}Îg~¾U¬%‚¼&°^@lŽmº–nÒª:¦ˆÕ¬Rª³>+´
jmm‚I
¼ÐÎ0¸ƒ<‚HøCm
DE©®žYzŠ{®+"¸*¨qfµk¥ù®á%bžœ¡~ß®‚"�¿þ+ÀúkŽ[|Æd†u¤©F«Â.,Þ§ÁÆÙD¬ÿCÈD#à>°A0È�äÁ:�«ý5¬&æ+!P…Á
$žâ­ì6¬À�ÈƬÌÎ,¡ZàÁ윰Á¨RE¹ÒlÒ‘¬Ð­ÑíÑ-ÒÉ¢©Ó>-ÔF­ÔN­y.­Ñ5-Õf­Ön-×v­•&l–íÖžêTŸ
‚â
ª¸M•:*,Öz­Û¾-ÜÆ­ÜîßQ9_U¨æª²ª»XÁÞª W­ú­}2íÜRiôXâ&®â..ã6®ã²DŸE®änÏùA8€p
ü@4t®ç~.膮è‚n
°Â2ÔÂXAá Ø"«T¤ëº²ëÞâ*¼>&µ¢½žÿ[—ùfë6éá>®ð/ñ¯ñR�¾\P…ùÀ2 7ü3˜å ÊVÀïöŸÕ^mö.éáÒË—�	›¸‰š€Éø†„ø†/ù¾‰ùºDK¨ÉùÆïñÎ/ýÊKòbOP0où቞ðÉMr¤®Y/Wt/Ýn/ѵ-
�à÷ÎK—”‰—x‰øÒš¸Éš¤/7p¼@p¯É[pý~°ñ&¯òÒå
øï¬MëîLV\oçŸ
pið‚0ç°ïp¾¨•ÿ0—0ùÂX€¤A,€/17±?1/@XÌÀ0„@ Ô°ÒzU¢.ªk6ê£Îð�j1—±Ÿÿñ•&U¦ñª¯ëkk»+®&,~Ò#£1ç±ï±ü©qÁ¤g¿¬ ,|Z´Õ1»9ä³ÝëÊÝ1?2$GòÇÕɦìʲ¬Ë¬©$w²'²'or®‚2)—²)×°(]ÓZ.æj.çŽ.,Dz,{néžnê®nù±rænî,÷²/Ӳ颮ê²n._î.¿ò/'3,ײ0ãrùÅ@ƒàCœ�5_36—Ä€ùé²++38‹.3ß21“Ÿ7ór8§sçŽó0s+£³:‡3;;óø�32dz2Ïs9‹4K35g3@´6sóü¥òÏ‘¬óB¯ôúÜ°ø%tôNÿoÏ54öŽD/ôD#JE‹_ˆ@¤�ü#ž®.^´DSoXQ4ù™4Ck´E?oD·4?4Lc´c"rQ©4G{4H‹ô�tAtÏ!tžìÉ"®­âšN‡ÿ5³®ð­"ÕR3uQ«°Ù¹mãTƒ_GsÀX&Á„" ˆõD„"Y�5›¦µÁ€2Dƒ”tUCõÃj¤L
ðFSuÿêîQ¬ONÄVBS[µ±ÚVƒXÿu`S•"WÕ_wõW$šuY«µXKöd[»5S30C°h³B
Œ¶çþ€i_j_
¬v–�34ƒ3|7Ì6mc®mß6nç¶nïÿ6o÷¶oÿ6oÓ6mßk;ƒŽ²6
¤ö5˜62�vé†vt¶Á5
«°aÞ®±òîˆ!ö	§°ófˆ%Õ_vwvŸ€wv;›ÁŒ·cƒõ—RÅaFYË7›š5}L44Ãh
\W÷e.ëí™ D×x㉿*ï
&¼îdTp÷�‘�˜€ÿ[o:¸wû±!3¶Kï´W»wX×w}W¶Z�õ}L~ï÷f5Ï‘,1G1ŒÇ¸Œ3ñWñg±øµø'ñŒ÷¸�/q�[1qïø�ùŒù�“_D8X@?Ìjÿžè¹678À,�ðA¹‹ó8’‡ù+ù��ÿŸŽ¿¸˜§9�S±�ãxø�9˜«yš“¹›ƒœË¹œÓùø5ù“G9â(•ƒž•c¹–syP«8Î9ò)/:£7:–ö•Q&åQ.%Sà;@<ЛA+º£wº§z/ö•jëTÀbõ‚.¤Â1Á#¬cAãÚ¶!Éz
­×º­ß:®çº®ï:¯Ó:!4»°;±»±;²'»²/;³7»³?;´G»´O;µW»µ;!ôº¶o;·óz¶w;¸‡»¸�;¹—»¹ïú¡¿ ³§˜€	�»ûA& Y~ñ[•ág²Ú{†G5Nõû�;À{;°_;Á¼Á<Â'¼Â/<Ãû·ø<ÄçúÃG<ÅW¼Å_¼·÷1g}œÈÁ- úXÿ;®;…­“¼˜¼ó•üSè:)Ѐ˿¼Ë“­ÿú±�D°wÀÍÛ<¤
èüÎû|ýÐ=ÑýÂO|­›¼ÊÓzÊ3ýÊózËÃüË˼ÄïºÒ'ýÓ;=É7=Öo½ÒŠÊ?½×¯ü×gýɃ=Æs{ÔK=
P=®§;țܬ�üÐýÒŸ½Ó'}¯ŸÂ) ûÀ;ÎçüÏ~ϾHþáï¼Ñ/>ã7¾ã_{�ÆHHA(;Ò3=Öç=ÞßýÉs;ßkûågþÝ_ýæ“>æ�~Ý—~ê£üꧾêëýë§}¸~¯ÿÃ}ÜkÜÜË~¹Óüã÷¾ïÿ>ð¿åë~À‡>ñ?ò'¿Øþí\î+?·ó¾ðO?õW¿õ+¼ñCík?÷wÅ3ÿWEº¤Szó‡¼û]É–¿ú?Vú#]û¯ÿT�¿W�z°ÚAܨh:²!&@Œ4�`AƒDh�aÃ�F”8‘aB1fÔˆ‘bG�	9’dI“'Q¦T¹’eK—%E¾”SfM›7gnÔ¹Óå
'A±:”ÅœaÐ�&Í�†!Ä‚B}¨ð)U@N¯&œšu+Vˆ#°âdqgÙ†Y0tP»vm‰5<Pã!ˆnÝw[(Z¡DˆDšÁÿ‚pÄÀ„A"»˜qcÇ*ÿ>™¢Ó¯OW}(X!çÍ_=ØðhÏ™7wnJº3ç얕ͱq­pç.aDroßcgë<›–-[·Wð¢‡Dsç$¬d(4�z‰~
)[mjU*WïÞ£–6íš;jſѧWÏ2ûzƒíµ~·\x«vðõ/S
¾>ýþ¨³"ï ØTÓ,¢àdsOÁY"AÚB«8ã$ò)ˆʨ, ÉÂCh–ÂŽÁI,ÑD±à[0E‰Îk¨Å”<¦…“ÑF¤Q²ZÒèÑGÞD¼QÈ!‰”qE÷Ž,RÉ‘h¬ñ¥_.9ã‹3$éA)͹ÿä—%—ÌñÁ“äRÌ1É$)ÌôÎ,SÍ&7:‰™7á„3–K¾€gÊLPÉóxÞá$8UjñÅ–ËK6MTÑEmÔÑG!�TÒI)­ÔÒK1ÍTÓM9E�%fú`EÔ>~áäMPÕ$]ù¥�>Þ4,@®º«U«î¾+P;þîëÕÖšM-ˆ-¶Øfƒ+‡e™Í� :�t„h©­ÖÚk±Í6ÚiÙäVÛo;m‰VÒ‰D‡su`'€xØA7’Hléc¢à
*Øð-�@ÌÆÃ,5^ïu-´•pBµ�•-¹å.hØá‡FCE_ÃhZo3âÖÛ�/â˜�-îÜ‘I.¦Ù䓃9äŒ3Œe�<þXä™W–ä�ÁzÙbŒiöøb›7Š9ç /ýP‡B•XzóUf$ŠSÍß‚EÔàƒ.Ë 2ì:‡‰­Xæž]Ûl�Ë>{è�×FÙí·áŽS•wN»lžÅfc»«9è¶÷^[lžÍ¦Ùïºñ.$8_MZéQc�z̪å®ÜòË1Ï\óÍ9w%¨%—œòÎI/ÝôÓQO]ÿuLCo}¥Ñy21M×i¯½ÄÙ}ÃÝöÝÝ÷Ž`wR¦s&£1<Òý÷å™ÇIùÇžo^ÅE¥¯86‡;á‰J(®â;@üJ hE{õ(3÷m­5{ÃB_öYSŸ´€ßçwµñìØúÛY$+üÔäLê3Ð\”@_Ù§+Ÿ¡Õ®¨[Ð+Üà�¨g§=®ŒÆÂkŒð(0!
ÊPg4ÃáÆaèÎ�†5´á
q˜Cî�‡8„!/²Bg¤ð„( á5BøƒF£ƒx¬@ç�൉!W›Ðq"Ò=¶” 
è8ÇÑ�ŽòMä|”�8Àöÿç€Sã¯~õ@6ÆÑ�¹úŸì.XÁ3²%³Ã•}âx•ù4°+ƒ®Yžø0P�m< v2xÇßMQ#gß%/é‘(`“cô‹$AJöðN”Dê])kGÉŒ€	•­t%IùJ0ER–jRåêp™K]î’—½üV-EG2ð±Åxbðå1‘™Le.ÓZÀœÚ-ËbÅâdm'Z\Ë÷6¾0Jhe!Ìt–2Hí­Iß|�9eC7fv.máTçµÚ6¶vš“nõìÙ=
'ÏÃáÓg+áúé7t:Ê™¶,q°6kª…‹^£õ³Ÿåól:!gEwÆOî³p:³'F5Κ}t ¸ë”[ÌêNŠfê5ïìèFEP�Šìføôæá:³œ¦S¤’*h™ ¹içA›ä¤6•Ùη•Ô¤MuêSOùS1ªUµêU±šÕ/Iuªˆb%WÁ*½è5f¬a]ITÍ:¤ Öd5Ø^ð„¾$/­uµ]YƒW»ÎHQ{ÒZ«ˆÐ+R.Õð€›XÅ–RèB!‚t’Bù•²7Ñ«ó³HøåG�èsßgßçYõK4ºò_ŒÌÓR‡ÿ µ²$l„;MŠ,ÏiŽ%º€vС½íÁ¶T�0¹Q~4PTþØZå†$–óä"�«Yãîq*ûQãå“/
ñË+ƒÄ`_—ëZ¯V{á#ì‚à
¬w½~`À{ßk
”£œˆÍ¼æÇ«Ñ
L´¢
ok/kY“L–�/‰QèXûßõ¼–1« |‰à‡qHÁÆ£�laáÒRÃèaðˆ2Üaä¹#>+‡Müªj•Å-vñ‹}™bªÌC5¶±‡f£ 
b$ð€:µS™È,ES‹¼UKfÅj[f³JÂ
³ò$F1—T¦hã©K?ªÏ•&™ÿÌì4\â×Ónδ¢5íà`&ä~J”hd³¨â–¬âƒ–—š:ÙÚhA`;rœ…Æ7”ÞùÍi)Î�\fI_î�y»¢ÿ8HΛpNé›/­Ò}~³o=�Tž™ü-ao…ë«·± °cÒµ¶õ­×‰j=ãš×½öõ¯±§ëÆ|˜A!¶®�ý’d[8ÁÇÖx#tciO¤­®†«\'ãlmC¦ÄÛ6Š½ÝbâÉÛ{‹«Xu'Ö@ 0v;»«ü¦¯0;ÍýHnÚ-»%¤.·p:
Ü�u´£ëHA„O7àßM”¾ŸlØòy"´µíÅIPèwûg�<?øqnÆäB|MÝ®L9«ß�y|åÿBc"	Ý\5ò¹i|¸IŽ’q§¤èU/{�ôvo<çE�É�>ÿ�f'�$;GÓ¡ÎïQB}ÃॺIšl­o�ëX½úI²Þu±��ì½ü:Ö÷¬½>o.r©‹]ð¢%è@ËJ¥h¤-ºè²ïÝmñDÛEëÜå�²9̼—-južRg/IØ/RîðEY9ÌÁøs†`èn^Ìò,uIݬ·0ÿ=ž|7½£Zz÷�TZñ6Mœ›õÞz5ë´Î7å(¤ßô´'Ta?ÁP×2„ÍŸžøÅ7>„rïÈŸùÍw>ž“<h“HêÑkõ¹}ö¥[¿"Ó1÷·�ý”ˆ_¹Û?AÆ=,c‹iû\Þ.¸Ê}®‘ݯÿ>à‘Ÿßuä?‰¥+´@˜Î¿èÇ2Pÿ´äÞö~D£}”çøo Ò/¶(¤B*ïò0Oˆ®á:®<êǹf¥´z…VlU鎳
¬
NŽþÍ€Fpÿ)ªK¿HÐ_)6$p+�â*Ä÷€/ø8pµPÙTðä2'NpjÌ�ÿœn=üïKi
ILûz
½¯Ø¨0ϬÐLï	Ïoùž¯Íðÿ›¤
‚ª"¡ò Ò`TÀè°íðñ0õ0k¡Â�€¡"a'Úð
ãp÷0qûðq	Ñ
áP±-ѱ,¦!`A†ADqI±MñQ1E`D`" ¦¡,
qñm13ñeQñ}Qsqub{ñ�±ƒ7‚)ñ�1w¢?1U±­ÑYÑa±QÔ° ‚êú�À
 Š~CÒ€Dà6Å‘ÍÑ7ÐQÙ±ÃqËQ=æqu†
, –Á=–¡tÂñ1{cëQ#ÿõ1ù"ïQ"ÓÃ!íñó1#)ò!1Â
R 	Ò 2ÇQÀ¢A
àåî-ßÖ'ßT`
Ôñ6b%[ò%;‚0¤¢	#¢&oR'tÒ%0bæ‚Ò&E'7¢
D€@$¢
Ð�À*Ñ/+Ç"+µÒ+)¢”!Œ XŠ’'=<Nã³R+,„²)‰’%�2>f2`ú«³Úç-�2#Î2‚D®Óçõ2'å-?"äJb05*¥’*'Â*¿r+µ²+¹R2'B,É2ëºýTÒÄ-Ynº®Ž“/=s.{R‚Î#JÓ4?S		Yp)‡ò)£r*«r
¯Òÿ)p7Çâ2Dz,ãò5ýæÓ¢51b%‰3ºÞH4_Ð ”“˜5wp×?n:«Ó0SÓ¸Œ ¦“1qó1·²7Ñs2#=3…%Á/¨ò` jÁT ?õs?ù³?ýó?
tû�"S!6b>ëó>tA´A�`@Õ±@uAí?ôB1T?”@
t#ø`8 
ja\š¨DMôDQ4EUÔƒ~À`	`
ø`Bé³B3ôFBE@B´FG�ô?74B;4#(ôGƒ4I5TGyÔH}ÔB•TI‡tG‹#>4DG”VtK¹tK£¡E_4Fg>¹¯ÉÁÀáîàÔtMÙ´MÝôMá4NÕôž
‚ãLÓTNõtOù”NíôNÑ”OuPÛÔOd
 ¼rQµQõQ!•Q#ÀAð”P1UP
Pó4S=N7U6.õSIµPë”SK5UçôTgQ5Ra5VeuR+• 6ózÐ0WuuW¹ñVÉ�W�5X‹ïVqUX�õXy•XY™µYqMY�5Z¥•ø uZ­õZ¹®Z±u[¹ÕÖ´µ[Á5\aì[ŵ\ÍiµªÈõ\Õu]“)]Ùõ]áuuÜ5^éµ^7g^í5_õõmðu_ýõ_µ¥_
v`	vS¶`6aOÍW¶avRöa%vbcg3—•b1v_#6c9Öa7¶cA¶`?6dIÖ_G¶dQ¶^O6eYÿ–]
àea6fe	�€(€
¨�
gm–feög�6h…vh‰¶h�öh‘6i•vi™¶i�öi¡6j¥vj©¶j­öj±6kµvk¹¶k½ökÁ–hiöfIa¶`Ð6	’mGÁlIA€
(ÀgÃöhiön‘àeñ–f‹!o‡	p6pq6o
7pápýVh‹áp÷p‹
·q—€$wr+
4ws¡ o)€s77q™	.w¨H÷r)7u%—rÿ–gm¶g³vQa¡va¶vq×v_6wq÷vy`wk7ˆWQëöx‘7y•wy™·y�×y÷oÉölÕ¶z­ÿ÷zÛ–R nçvo)@gwVnc×fs–
¢o
àwa
uÏ7zÉ7gçÖr—sÍ·}i–
š õ×
	�Á8€ù×~i
Öà€x
:
N �øÔ	Ôà�8‚Õ€08ƒ¹ s/Xƒ1¸s	8„‘
ƒ)¸	ü—‚O`
L˜
�#˜€)@õW
ú7„ïöe³’}q·x#òv€ˆë¡|¸
øàˆ‘8QóÖ`œØ‰#	`!¨˜Š!v@Š­
¸¸‹³Ø†Á8ŒÅxŒÉ¸ŒÍøŒÑ8�ÕŒSÀ‡×ø�á8ŽåxŽé¸ŽÏw|ÇÊÖlùØl“€ÿymûx�ó€	�!� â`‘ñ!ù‘Saþ
ðx|¥øwk¶’59guÖÄw~5wð6ò 6`˜ �e¸	x(À8€¡@“Ç×€[x
Ô€&…w¹—8ƒÙƒ?˜—‰yƒm9™ñØ<¸�› –QøžrY…•ùf[¹	høšc×g³²f/yx‰·
æ6ˆƒ˜ˆ) 
†‰�(—‰™ø‰#€¦¸Š«xèÙô¹‹ÁŸ¹ùŸ
: z 	º 
ú :¡ÿü9 ¥í¡!:¢%z¢)º¢-ú¢1:£+Ú–m ^@UõBÀš
`þ�
ÿùŠ€šØ‰
€"`’`�×ö¶W|©À!pà§úüA
Ø¢Æw§™@à6+q7+c™ ª]à�o ©Uasã–
6W
ðÈ `AÖ\Àf]`i™`–
¸–•—‚y9šÙ�5x˜‰¹–›à˜åÚ 	€˜OÀÜ:šŸÙªù™•²¹	`ùšÅ—f¿ÙfWQç–xÍyÜ	†¸ع³á9ž×ažÀ‰í9æ®XŸ÷¹¡:¶e{¶i»¶mû¶)ŒZ %¯¼|û·�;¸…{¸‰»¸¯è¨Ž
 ’�!dˆP@‰–hº©ÿ»º­Ûº�¨ ÀØ*|;Y¶€˛Ø Ô{½Õ›ÚÖlG�¼ï l7 TaªÁ|™`hÀÖ¢@g	 6•
Ð%ä!gS@üÁâàâÀf @
6 "|‘y’‘ÁDÜT!:ÁtV6àÖÅC|@
¦Úb\ÆóûÆi
Ô`Çwœ¬šÇ�ÜÇ	Èy\ȉ|ǧzÈ�¿o¼É›ÜŽ\
  Ä£|¨<Æ}ÜÉ;
$—˜\ËÁWp9y“wöŽË¼Q¿—
õ{Ó¹Qý·ÍÕÁ|Îé¼ÎíüÎñ<Ïõ|Ïù¼ÏýÿüÎCò¼·�»Ð
ýÐÑ * ÑýÑ- ¿ïÂÔ”¨K5]E™�G8 î ¿G\ÄU�’ P=ÕQ9žáráÕ÷¾ï ÕQ]mëû¾G]ÄÆÖ"F|×Ç ÔBBœÄ‹€Ø; ò`-p Š€¨;@òÀÖª™àˆ] ª½ÝË	`hÖBÀ]©AÜk\Ý»ºÇsýÝ™ Ê™ÀâýÈç½Þ‰ÜËñ=Èé=ʽ\Ä£\Æß}Ô•œÈï»ày
æ�Ö½Û¡@©!ž	þýÛ£:×E}àGœª-y§‘ᎧzÍ=äÕÍCžä1þäQÿ>åU~åUXþå1Þåa~æG| hÞæ]çG]çi~àIÁfžÐÑ-P-Š~è‘Þ·Ò™¾$=×`P€~€!•�$ô2×½�	`îÀ>ìÁ~ÈÞÛmÅ^ìC`Æà@⣚	’!ˆ�Ú;ÀÜ¡Z
ÜaÖbÀ¤¡ZÅY¼:�
òÀ¿;Ta°]-" ñu@
  àvßÕ`0¿ÀC€ÔÀ €®}@
žìQŸìM?ªy(þÛgA¯3ØÀŽ™ömƒ_`÷_Àôm€÷�ß÷�Ÿ÷Mª‡÷}àõ½
2ø�“_
R¸…iÿ_Ö õ' ô¯:€ñÀ¸?ô™`€
Þ^Û½\gåÖª•ª‘
xxœ}Üœ?»
|œ��Ø`��žŸxîÿ´
b]Œ�#h(¡µ…Öx1¢Ä‰+Z¼ˆÑ" ‰€:Fìèñ!È�"C–4	‘äÈŠ ?¢,	“ÀÈ�-cšœ™²¦Ì•¸É(1†D‹-:ô¨Ò¥L“vpÊ´iÔ§F“B�J«Ö¥
:Tø
6ìW¡
$0MY�‘#ØÎtû6. ¶ U,à â€D&|™(H¶eBžÁ„	'Ù‚xË(`…ç™°eL®d
úª@ƒŽQ}<#VTGƒÈú2‘Aÿ£(®ˆþs*QtyüuE#w„ªÔøž|V²:dß–—'…_Ì›OPÃ$Å„éÔ×ÌŠ¾&»v릻ó�uâ—ñãm0±A>½y/Ú»q�ýûöñçÓïkÿÅïÝS¤‚~…·Ýæ)�uÓ]§Jsxàaƒ
Щœo)¤ 
_>ä2T¸ÀŸiÀBân»ýÁ„;¬Èb=
¤X2΀#Žë¬Sc;îHPL40PBF
b’J.Éd“LÒ”|I)%TöEåHSbéÝ•[v	Ò”UF&–YŠ‰¦•gª)¦–l¾©¤ONö%VNÝIžYí‰ÔÿQVõ™ž.…ÁUW噧ž[-JTW`
iXduwVZk±EH™ÒÅ©¦m:×Hváu@wªœªŠŒB„®Ú0A£Ì:
)¯Þúj£Ð°Á
œª@.4ˆ`Ô"¨¦úL*Eá0š¨*°Á)¡±¦T(|$SÛlÿlë

œ
¦€Ç…5‹*)8G]ºÉ(8AvéP ¼ÇÞ{ª
!¤Wž*è‘çž
þæ—®|óL0ªùM€ï½É¤BÄx¨qÛ	œ‚v
¦«€ƒÚ�Lª6€;@
¿¦š!¸À

ˉ%ž¨

,ÞÜ@Íõì<#9ߘcŽ°¨òÇ�FýÿAEÂÛËN?
uÔRG
ȽUŸzõÕªd�*×X
ö±^o�¯ÖZ‡ÝuÕ¥�uÖn·
÷Öoƒ½¶ÜQ“âÅÔ¨Ö)UU€êy¨ß‚ŽhU…n5螉óɨVŽ†…�X�uo¥jÉjæpeê)\�š×½
Œ>z2§ŒEêPCë¬x¨{ìª�r‡d”ý-FE@:éØ劆¤c¦,Q3PÛ
Çþ•m:ô>ú…�‹¯¥Gk¥'“ÌÞ—<úàgò·ãÏR>ô½§0~„&§€«¸
À�ëûñÛ_?éñ[¯~ï#�»ó¡otãó^ù¸‡À‘Nz
ìŸèúGºµÿ"Œð‹*Á–a°‚¿úƒ?ˆ¢Ê€ðƒŒáÿ@Ž0…l¡_ÃÊp†€P_
gˆÃêp‡<ìß°�C¾)R�JÔ�Šˆ”Ã5E‰ITâ8"Έ‹{J৔ÇINRôÎÂ
\JS#(#¦@õ)3’qSt
Ý
\˜�"	Å`­’`ƒbèq�|ìc1’�ŒA”@bS”NA2xF.60†^
 E
!»·
€†(øÈÅ)Z“<èDÑA.N)ƒ÷¥ ÂRÖ!º‡‡S¯èxß÷n™>²ï|”IFpNyÊ^˜ ûKün×ÂdÓ˜¸ÿBæþæ÷Ì˜¾Ú%çW@ð¥à–àÞ
“ÁÀ\¶f|!R¥€
ª�ã<a‰vBºSžñì¡=ï‰Ï|êsŸü„ 0êÄ+.J ˆ#(ŠÐ„v@‹[K¿˜†Z,s­(E—ÑàCo\_8ðŒ$` u³"…IIAÒ”Žb¤‚|FÉ°
a0j•2A':Ð	¤"8¸i'þ�Aä
x½;LmÓ
)¸Â²Ñ
+O¹�<è®dØ©q™‡T^ÓÉE8¿:`ˆµb!Ø@
6@ÖÜáx ×Zߺֶâ!?mý*çj³âu>f½ÐÂØ÷×
Àõ­ØfÿZ%¶M±*v:âz×tƒ‡T*s6Èpºi×p2"ž&�ÌHÄ“™ÈD;øCf¥ÇˆžÍ¨
)`DÐt‹Íh‰mÒ”6�"œv·¼í­oÜà
w¸Ä-®qO;�ØWˆ
m®sŸÝE Ô­®u­ÛÅpNÇHCÞðŠw¼ä-¯y�p`ÃAaˆÀø‚t²Â„#î‹ßüêט˜Õ)ZÚÍøÆ÷E(°�‹À
+øêÜà+1Äb‡Xe÷nÉÈnRoæ04ŒÇLF\�Àdß\Œ•¬HZ+öV<$ƒ�ëŒó“Ç7ï9€�[ÿœùÇ\+�,ƒßaq<lr<ÅJ¹Å[¥a&3<t•
Ö187BU$ƒÀEð,hÇ<ZýÁËÜK­jùP„d¸öµh€œi»#XÜ·1ˆ3›ÿè@zЄ.´¡�èDzk&téHKzÒ”®´¥/�éLkzӜ9­`„©ÆD€êT«zÕ¬nµ«E :Dì’òåæ÷ž
I”Òq¿ùýã’ðßHºÔÖ·$ó�‹Àbã²ÁÜ&eØ@á
_Ø{Œ”Á)¿×aGvBmŒ‰©WbI*›zNþ0`ã,+9†Äñ¸½ä!ûøÃñ–÷‡½'obO€z£ž’÷�'³[RVl¯H¬ ÁT/ËZÞ5ßÝÍ{PU)8p@[2X¤9Œ€8xÖ³" µt¹kñÜ€‘ãy"‡¸Ë_ó˜Ë|æ4¯¹ÍoŽóœë|ç<ï¹Ïÿô S×c
îp˜Ä &	¤ø¯ …-ƒ—‡sÂ/GqÌ«�ajc½ÚÜž&—­íõ¨¿[ÙîpÔÉ^ö
D=jûƒªÇv·¿âq—ûÚåþ ±3\îÕ“
ÞñÐw¼;œÛi<Ú9̳{=bßzÖ!.`ª0Ú¾p´Ù€ùi+;˜ï<æ�ÍlFUÎÌ}è�*ôÔ«~õ¬o½ë_ûØ˞环ý3p
É¢�a0º�än_ûàøÄ/¾ñ��üä+ùÌo¾óŸýèKúÔ¯¾õ¯�ýìkûÜï¾÷¿~ê;rñÏ¿ùÏ�þô«ýìo¿ûßÿøËþô7>Â`ˆÿèÿüï¿ÿÿ€
(€H€h€ˆ€	¨€È€
è€�(�H�h�ˆ�¨�È�è�˜€÷%h‚'ˆ‚)¨‚+È‚-è‚/ƒ1(ƒ3Hƒ5hƒ7ˆƒ9¨ƒ;ȃ=èƒ?„A(„CH„Eh„Gˆ„I¨„3ˆ 
O…Q(…SH…Uh…Wˆ…Y¨…[È…]è…_†a(†cH†eh†TXñ †p†mè†o‡q(‡sH‡uh‡wˆ‡y8…â Wà‡xýPÛÐ…hˆ@ €¨ˆ‹Èˆ�èˆ�‰‘(‰h¬0‰—ˆ‰™¨‰€X‰›è‰ŸŠ¡ˆ‰�(ÿ‰ñÐè€pþ Š­èŠ¢HŠ¯(‹³H‹‹‹�h
ÃRç0iP‹ÃHŒžx‹ÅˆŒ¡ˆ95à
9àŒÏ˜”E�Õh�׈�€`
(PQQ ÙÐ
Ù��ãHŽo±�U
J! åèŽï�˜sŽUi°8`Š
P
%Ðñè�ÿXŽó�I�ÙqèpYà…P] %°i‘y�‰‘I�ÌX
`!)’#’0�YQœó)ðhÜÐ��1	“àH−+©9ÔØ’r±œ°�°ú°o°^±ŽDÑŽ7ù�*É’.)ÿÿRÐ	]PrÐWÙÇðJɕظ“qñ�ƒ]Ù9É”õ•r‘]�
 Q
ê0�0 @–ué9㘖oÑ!
eTF!@±—|é—ïÈ”gÙ•+ÀA À˜�Ù˜ìp‘y’q¡F9™�†Y–™IŽ;àÝ(Q•RÀ£ÉY@™hDŽ†‰™qÁ™<ù¯	›P”´„ŠèPrQ™«Y�º‰�˜É›¬Ù™r!€Š怕Wy¿€9œó›ÔX™ùœÑš`)–”y—5�…©™½y�Õ)Q �	­`@­`žˆÐ
ê@QÎi�ÓùžÙ�ò	à)ÿÀ—#piÐúÉ—ý™’ªù…ÉF‰˜A€$À 
JvÀœp•rp�Àœš9�‚“j f„Fš¡��˜ƒŸqè“)Š¢(jšÊ¡"º¡Ê—1ª9˜Y¢ ±¯9°£²ù^áñ€›!Z£4J 8I¤Eª¤Ü©¤–ù7ÚãpoPYPo ’€
[Š
ËÙœ›3z¤¨Ù ò¡0J£Nú¤Áùÿð
Œ2–a:¤i
¢¹‰¦ž£’uŠ¤/jQPÚd	”ÀÆ`Æ�‰À¯À­��P
ïÉ�¨¹§w*©d$§tº¤gê)¼é§3±ûy÷	ÿª_Ú¤z*§eš¤œB¦Ø¸N  ,«±
æÀ¥µz
¦ º©¡Â¤“šªHÚ�rÑ©Æi¬)ú
Т—ŠªNŠªÍš�|ZQ~ºS`­S ØZ”`A·‰�¼
¬+ù¬sê¬eiªç¬Âʦ#á	~`ï
¯fàå 	õê¥äš“jÔ«aºŸºj™šú«ÿj£ë:ÿÀ‹Ò	qJŸ¾
°ð™¦šÙ°áš¯«9¬êÐ
0°¨æy
†z¨‰0ó°›»Š)¾Š§éz§{²º
­$J°o
 e$ €ð²ü韸ٯÛ�|
°jZ�5ðAà
0 ´C;‘yõj‘y	±€ÿ¡i´F%Û´O»§3šF•Š9õв3
\›¢19]ß:lä°jš§S»šX˓Дm+”b1‘äš›Ñiµ™Iµ¥Zµdz·ú:¢q¡¶oÑ
~ÀƒK¸འ½À	[	©sëœv*¶5ê¸R›·$ë¡};Û¦é¸
 °üJ·�+¹kµjªc+¦º©¹q
¨PƒZ›Œú±�@Íy·Àš»|»ª‹º�¼k¤²–ê»o±º3
ûy	ÉË—Ë›’xº·¹®d±˜�œP¯íÀ¸vy‘²à¤I¾¤¹¬ÞkQàkQY›í‹ŠÞŠ¾Ñ‹‘ê¸~Pm
÷‹¿¥à®¿ý;ôûPLÀlÀ…P³þ[—, 0»­ »KžêPãhŸ
<ŸÔÈÀÌÁÌ•¢ð<� ,Â%,$«�¿øëã`Âu‰Â/,ÀØ
r	
U°3lÂ5ÌÃÿ?ÄA,ÄC|‘“ð	G<	.LÄKÌÄMìÄOÅQ,ÅSLÅUlÅWŒÅY,ÂÀÅ]ìÅ_Æa,ÆcLÆelÆgŒÆi¬ÆkÌÆ_܆Çq,ÇsLÇulÇwŒÇy¬Ç{ÌÇ}ìÇÈ�,ȃLÈ…lȇŒÈ‰¬È‹ÌÈ�ìÈ�ÉŠ¼	›ÐÆ•lÉ—ŒÉ™¬É•ÜzèÉŸÊ¡,Ê£LÊ¥lʧŒÊ©l†nÀÊ­ìʯ˱,˳L˵lË·ŒË¹¬Ë»Ì˯Ü?ÌÁ,ÌÃLÌÅlÌÇŒÌɬÌËÌÌÍìÌÏÍÑ,ÍÓLÍÕlÍ׌ÍÙ¬ÍÛÌÍÝìÍßÎÚ¬
ãLÎä
€ÿŽy
$à
 PÎïÏñ,ÏóLÏõlÏ÷ŒÏù¬Ïû<Ï
@ÿÐ
-ÐMÐmÐ�Ð	­ÐÍÐ
íÐ
Ñ-ÑMÑmÑ�Ñ­ÑÍÑíÑ�Ñó@
< '�҆؊° ÀüÓü\Fð<Ó1mÓ7ÓþÒ;ÍÓ=íÓ?
ÔA-ÔCMÔEmÔG
Ôó¼” V ÎO}
h 4=ã\Óú|ÕåœÕô¼ÕÐÕ8
Öa
Ï:�ÔemÖg�Öi­ÖkÍÖmíÖ­Ô‰©J×
:SýÎ5­×UíÕ|½×VÍ×yݯ€MØ}]ØmØ}Í—bÍØúLÖo
Ù‘-Ùÿ“MÙ•mÙ—=ÔJíªˆ0�íÙŸÝÙØ€×Z]ÕW�اؤMÕ‡í×­]تÝر�Ï�ÝÐÍ`Ûe€Û¹­Û»ÍÛ½íÛ¿
ÜÁ-ܹmÛmÛÍ0ÜÉ­ÜËÍÜÄ]Ü}ÜÍ-ÝÓMÝÏ]ÐÑMÝÙ­ÝÁmÝ�ÝÛ
Þá]Ç}Ðß-Þç=ÝÝ]Ôš0«ï
߈0ÚälÚ­�ÕûIÚ©�Ø‚]ßô�߀Ýß²-àôLÛ
]à˜MЦÖ
?p
(0ÞÝVÜ;°ŽÊÐNáŽáÐ^Å~áâ„ âTLâ®á
m
°Ðá%áNÔóÌ@°„¨Ò;¾
ÿ+°þ0àA.äCžÏ^ÞFŽà­àm ð3þÏÍ�â#¾ 
Ñp
-NRŽÅ²°ÚÐXÞâ\~Å^æbnÛS®âU~åYNã/Þå_ænžÙDnçwŽça�ä]{žä­à²p¬ðäãÝçZ,õ€Þ€æ‡žÅ‰®
m®Ê æUémŽ•Nʼn¾èhž0þèõéhÔyn꧎êîÐ}þç
èƒþä™®ÅqéX.ë³.|éÞ…èº~å ¾Þå¢Þæ¶ê¿¾ëPîÓ³îì3áçÍê­îê1 è¬
ÂNì�Žg®í³¾²ÐíÞW0ìZîÝŽ	`îÛnÅâæFçŽîðÞ…Nãÿ;ýìûÑ.ÐÓNíÕ.Ú°îí�e¿ä _ðô> Øë�l�µ ›€	Àî*àŽûi–ÿHñ˜oî¿°Qk‘
/ïî�‹’�9ß°á<ÍïÏîï

ð]F=Ýó@ÿó­à /òO˜`Zµh
óÕ¸²`ô¯�0Ê»Â{F›z³ÖK¹Ö¸°	!/õ—i³Á»¤cË«_¼Nïõ`?òõ¹9»;½M_QOõmŸÁL¿¡po¦ªÊ÷©kŸ]ï4_ }óΞó½óô
ô�?ôŽïó�/ùÿù”?ô­àXÀöH_ŽçŠöã*÷Õhÿkô�+©û»Ã›÷TñÔh
àOö—I¶úz©Iú«¡ß¯û¥Ÿô”Š³i�£ÿõ¾�¯!:®™Êú#k®˜Š�¯¯
Wàä5ßÑþ¨è¬Îì\…¿‡ÿω¯Ð‹ù–Oþ„Pùæùã�þåoùâ/Ñ™¿ù-OûJ�·(°ÿ„Ú`÷·o·À€F"8P Á‚
<ˆ°¡Cˆ!†kàF‚mWTHäÈ°!Ã…
†ùÐ$G”)ZĨ1åK“$?–	ÓfJŠ^.fÜرdB #ƒÊt(“dÍ›hWàŠ2„¤N¥ZÕêÕ©0Gä*Ð# ¨ñTÖl´ÿ-­P"$iш_ßÎ¥[×nÊXõ–É«WïÖ­T
�˜˜�áÆ&œ˜1áÅ~%[5	4.»ÛÙs]QwŠãüYîgÔ5Àª”YéÔ±O¢^ÝÁëÒ²u£Í÷nݧë®Õôi³ÉÉ©¾h%AV.L§^}:EqµjŸ»õ'pðIû*'Ä—üyôéÕ£¯|9óæðñéÖv
[þý›ÖX×Ï�ß¿Dýlûí?¢ï6û
TýìQ¡€k”An=«nì´xB:ôðÇȢÁ†
)Oëj6£húnA”ÆSÎ<
k´ñÆäÚÃL3úƒ?ýpáïÇÿÛ€EH}$2>#‘pIù‚JüŒ´g™h"œÐFæPZÁ‰ bL2Ë›áRs&¡Xôé Ûd“ÊÑ£G<óÄSÇ÷z¤S¾6"øfÊ?ÃtÐ$5TPB•íÐF}4	°Ô’Ë—¼ëÊ;‡¾BuÔPIóE¯�J$NgŠUNU…UR‚dœÆ2öX 
Â
ŒÖ1€õ4öXöbh`Yf›uöYh£•vZj«µöZl³Õv[n»õö[pÃw\rË5[w²­‡Ö‰
p± �öðÄ”H&KM VØ&-€ÓÚf à õຊEva†vøacˆ#–xbŠ+¶øbŒ3–
aŽ9VXc�Cyd’K6ùd”SƸc–%ýXe˜c–yfšk¶ùf•[ÖùÏ—qöùg ƒzh¢GÞùè%{.zi¦›vúi¨}Fzê•ÆŠj¬³Özk®»öZÿ"<¿Û3«¯ûl´ÓV{m¶a
µ=jø7` Üj[Ѳ+¼{o¾ûöûoà)bŒÆ("”Þþ,¬w<J€<éô"Š{n€ëž|sÎ;÷œêBýa„9…”;Dß!"ÅQR¢°ªñÀ
Úk·�v$'±D‰äjÎuUÇλªˆ¼ñÈSó�ÈV?wþyèü!a€¡a~Èè`ûü!`Ø€¨õ7å$(Ã
­Sÿì¸+ªUXgM¨y8_�?Õ÷§'røå`÷@öÛÐ
¹ë]¦Ü×ýõ.�Ñc`H¢5�#l¸ÞŠ�T°a§ðG\‘‡
Ð@|!_
MÔÿ)
!D+$
š$ˆ¢^((¬_AsÂ�ðÎQüË
DЧ‡õY§}q¹!Û”"º*S|`�ø¹Å)N	�qEF°!ÛCÇ?ØÀU( )¡gè0!‚TkdANuF#qN4ôJ2E¼U·)d!ˆ\xÀ8ºˆŽt$Š…˜øDD&’o)䜾†À€År‘Š"LR’
HÁ	RƺÔà	AðLyJTš’€ŠL˜;•F6’Ê�&Tüj	?[vä†6L
ýXùK`î�‘·¤É.!"Œ?ì õXÇöp ÌzìàÂŽ‚Ù1nv£,e*½¹Ê©qùòšã$ç䦷`4ëd'ŒÕUóFå¤U6	AO|æSŸ\‹Áà
W„$Κû¤“=	zP„&k T¨ÚPˆFT¢PbèDÁcϨeT£åhG=ê‹£%iIMzR”ž,¤ÿiJ]úR˜ÆT¦ÿ®ôÌåÖÍ­´¥3åiO}úÓŽ¦ÆxÇKžN�zT¤&U©ÝŽc7;
Úœ·§›º<±ít©[åjW½ú°¦šÏ9b©3ÄÚPVÆdkáb\jªyÆÜáWA–äU¯{åk_ýúWÀV°ƒ%la
{XÄ&V±‹elc¿D¢yD–¡#dV³›ålg=ÛÙZô#|FòeWô„«èSa=ôÇ´òD¼NHî'§…è0�¨Å^¹÷[àW¸Ã%nq�{\ä&W¹Ëens�û\è:7ÈÅ+d±<8`	Kp7œQe„W¼ã%oyÍ;^ àËèÿ‡À
Œ@ð–<aM«§ÔKQÍr�G´ã‰Ê+Aò÷Œ<“ïÅ|]'XÁfpƒüàãN·¦p…'\]½¼ Üp€3
Àÿh!
Á
œ¡rÓ›ßÔ�Bµzbõ˜¹€p�•KcàâØÆ;æq�; aÃX9€~ÐŒhh¥¶ftˆ
@âÀX2+u¨”'&ãè8ËÄÕ²q»¼½/G7ÌÍýò˜}|f4K·ö+…‡|•!Ê(@ÉVºFÄÉP¶²^¨ŒŸ÷Y9XÎr—uŒcDs/Ñ`ÞrpµLãC+šÑ“þm¤)-ÜE7ÚÒiæt§—d6çÕÂo¶Jœÿç\ç”L�z~²¢,h½ý9>�†µd]éKOºÌ9Æ4®7�é^Sz׺–t£�íid';¸ ²›1`]8¡tNµšäø»=»ºÖÄ“õ¬·Ý0BïµÒy-v¡Mn0—yÓæ>÷˜Ñ­×áŠ;Ýèfw¹×­l|טÙÍ®©«r€Z,㬠�Òm[›Ý¾¨ÂvëN:ߧx²÷ÝlS%ëX@?ja„\ä#'yÉM~rÌöcÄ"HE~O†7üåÆ‚xÅm~sœ?ø°Ð¾JØÀ
 ]èC'zÑ�.ô8àCÃ0ÜÌScSºÙ-¤´žyÕ­Žp<ãàz×½þu°‡]ì\¿Ã3Àau¡zàxÈk±E©~u¸Ç]îÿ£ï‹žU©¶]­U]ÞUQåµ·Ï]ðƒ'<…Tû¢šõ¬odQ.WEÌù}eEò{<]ó\¨À^ó›ç|ÿª�Ãóñѵ‚í‹d›Ã].¹†�ÇíÞ)ÒÎÇ^ö³Om÷k_üæ—ñ’äµüªþ
X‰PÊ<í�|X§˜”+NåTZ|äG_ú¨�¹Ì§}ì_½úÀ�~ö½ÿý˜n7ÝùÍÿQñ룒¥¬e1ûYøÇ_þ›
íhK{Z«°¿²—�ÿýOÑ"-ÓÒýs¿ÿ;Àù«?
Ä?«˜†€y˜@
¬@¼@Ì@
��Eˆ€˜œ¬ý{?<AÐÿ
ÀûÁöã?|AÍRÀ¼ŠtA|A@$A¼ATAlÀŒÀ
,B#<ÂüÀÄ”ôK
{Â.íâ.ï¯óªB+¼ÂðJ¯õj¯÷Š¯ª€Âíê®ïÂB2,Ã,T/ör/øº
0”Â14C8¬B-LÃ.¼Š4€…a˜
˜—èC?üC@DADBÜ^±€H6Ì®0œÂ8|ÄòšC.\C«hC1¤BHÌDITC/¤
KtÄLÔD4œÄNœŠO|ÃP|ÄM¬Ãª¸Ã<ÜCz)DYœÅYLƒCLÄiÂØ°'
ã01"13±ªèÅû°%Æ»
cüÅd\9b¬
<ÿÄè%Y�e¨…€fÜ°cÆQÆh¤ŠfDÆ`„F«(Gp„qLGotÆsF«˜Æj¼FÉÆmÌE]D
{*²#K²½S�l{5ªðG$cŽËK+›H83²ƒ\¢ªB
†´Š
X€žàˆf�º(`#øƒH"JH…ü;‰˜ÈsH’T+𕜊‘T “´˜l5‚”I–¬‹¹ú½…ÄIŠ´HŒ„‰eAˆ�É�ÚG~LS£6³¹Š+®˜J†ˆI©xJT«»;b½›Àʬ”3¨,Ÿ’¤ª®L	°$„Š¼ÈŒ”ˆ£¬•Z)J£,Ê�f�‰i‹†�Œ¶Sÿ#Ë‘p¼ÔÌÓHK­tŸ‘Ê;«‰(b5>û7±ÜJ…L«‰Å„°,Ì˵ʗ8Ê·|K»”ËÑ$ÍÒ|‰¼ÜKÃcJ²qÊÇ4K׋ÊÔ;K„Ë|M›P½9úJ ,5ÜôKÚìJýIËÎlˈ¨ËÒMѴ˹¼Ë”HM‘üÍýÊ­Ù\¸º<”Ψ0):IÛìÍ‚ÔNŸ&ÿ*OŸ¼Í¾ÌLáÛLðœŠâ$J¸M£„Kút–çT½\JË$‡ÐêÃ4°
‡pQÐ
°kh•5€aáƒeÚ
	�JÚ¤s¹Ðo‘¤IŠ	…&>``PYPÐ6@P~%P
P{ˆE�#ㄈ~”¶±ô=áSµºÍiƒLÛs$ŸDËö”IÕQ@
>ò|	âÊuˆådNúœO&}Ò%�茶%KY1OµÌ
Ë*%¤àÄÒºÉÆÏ.ݯùùÒ9Ó„#Ó±´këQ#ÝÒ÷ü̹lRù¬O'åˆ)ÿ]MÖ¼‹~¸�£ƒC¸œÌJ@%8(Ô5-ÈCUà”E-T©˜S"a†àX‘lÔD=¸E•INåÉ؈ÔRUºx½” Õ3ÕQUª Ô±TLÕT}ìS»°§�ë¸�C9^íU_9#P9k9«ÈU�¹_MVe¹`]9b-VŽ;Öe�Ö_mÖau9«àƒEà€4¨f`…WqWr-Ws=×s�†pír€àƒ«0Ö]¥Vz=9ke9l­
yEÖzíWfV|…V]åWí×{}V�‹Öy-XƒX„�
måVoWt­X‹½ØPWvå®w­U[¥Œò¹£Y’ÿ-Ù¢Kº¥kºžû9“mY—%:”eº"Б}Y›uÙ˜UÙ«ˆ
>°€8p�¡Z¢-Z£=Z¤5Ú§à0‡ Y–½Y©Ùœ�Y¬¨Ù©ÍZ˜U:™½Ú¨ÕZ°å€ªõÚ°-Û±ÝÙžýÙeÚ¤m[·uÛ¥u€¦}Z�ýØ·h©¬Ûº±Û[¾í[¯+»³“Œ¼õ[Â-ܯÜä\Ã]\¿EÜÉXˆÅ–0€H\­c\ÍÝ[ÇÜÌÝ\Ð=\³›Å
]Óí\½(]Ó]ÔÅ
È•Üɵ–ʽÜy²[�=?ÜÍ]®Š
%ð4°ð€pˆqðˆ"?ÝM^åšØ‹±ÿ0‹³H‹t¨p±åÍ^íM©ØxŽèX;_Kˆ‚
(
°ÒݨM3EUâK/x_ø�_ù�_ú­_û½ß÷UKØ_þí_ÿý_`
`.`>`N`^`n`~`Žàþ%ü­`¾àû¥`Þ`î`þ`aû­ÛÎø¡²v@v ƒhá8‚XR—œa8¡ÎL©¤Löõ6ôaÎà�`!b".b#>b$Nb%`
þa'¦ß&~b)žb*®âæÓÏ°/3‚9(�x(

�Tã#ø¶J«%ô-OÉLãºêa+öaý]b:®c;¾c<ÿÎã:Žâ8a>îc@dAÆ_¾O
•Qñ3XäE6�FÐM(cæÎßë»þ¢Ñ¾{džc=þdPeQå%þcNÆ`S>eÞ
úfeUöc,ö~ñ€Q?`]Öe"X…Gx3~>÷�_XŽåøõäÿÝžþíRnfg~fh¶cS.æ0æc¶ßb~åj&fjÞæ
Îæ÷çgkFåYÞ
OðƒRXçu&‚O8Þa–ßl†ezÞæzgo–_H�þM
˜_dö_fVf`f�6h‚Nh„^èhnh‡~h	ž0žæÁ€_p¾g/ çøÝç~þçúMåŒÎgyÖ¶g‘&çjveŒNi’Æg‹^é�fé—.ç÷åhþõç>gà˜„UØé[膈Údnén†i�žß}¶i(â6è‚Vèýuê¦~j††hª®j«à.�‚í‘‚.0`�&jožg‘®à£öèÆæ’vé�Æhyi°~ë˜꘎_¶–i/(kBÆiÛýÌx¦ë±kWn颾à€^f�æ_à’jÅŽj©&è«~lȆæxèv¨lËî‚x àT®h°ìµk?Fkξ|ì¶ökÁÎgÒŽë°nmÀl»þÿh½Þë:�ãoNë>.ìÈÞmÞîm:þêØÎßànâ–íõ í»íëâöÝömç~nèf`àîé^nëæäBFn�Tîânîèþnðïý­n»&ïë>ï8Îní>Nî&nïoøŽïÈ6ïr¦oô¾ï'VïºèÝß­Žà^·Û^
pŽ’
ç%è„[f©;¨‡’˜[ï?‹ðƒ¡ð>Õoºð^éP<öa¼Ý‰ÈGNÝÕý¡)E±p	·(w”ßGŸ^!+È€B¨q/�~`2¦­"r«¶òRü	HÈûËL¾Uÿ¨Ëœ·‰Oqˆjò?�òô{ñ·Ðâ-žƒa€†,Øÿò,€†HÇäï�#Ød½6>Š"÷Ó#¼¬H‰¡zœ¢J
)Ç�4wS'�òŽ©s®ìó&¢ò¤8d6Âò.çr/ó3¦dó!s8RtF¿ó¹xp‡¨¹ƒóÿ�*¼ ½ŸÏƒS§%ÃôHÏóÔàó%1u^²¶ž4!1ÓF+"�!V	õ˜ðNšíº¨eÌ
uÈrCÏ‚/wð5§ô7÷²
";¨e¯uà€×ù/"½ÒáÃ*]OR'TÿS'
Þ+s«ªQ/µ­!?	_¢öM	÷YÿôOÂõݨ[Œ÷40a®=ˆ ö”`-ÂrhèwvÖ‰vZêÎ0
¢03ju[ÏvÙváóÊ´dúv4Ūɻv�7wîh¤é)RŽtí–t„Àw/�¥5âwïw€çôT³<ÀTcÉs<&£­;‚y…oø=WÏ—Ïas×!–�k/÷Ĥ*�__š”øŽw÷y‚È‚hz§úbçQZ>oR‚,?ùC‡v*‰¢Q¯y=熗5�Gn¥��Z(�H{µ/
zx¯ò›·ÿÛ±§‹Xøe»�a‰*{:	û·ÿ%¾/�¿_©¹OŠG8s�–s8‚Gøé5ßû¾o¨Àÿ�ÉWq¤¯‹G¸x€‡/@|I8ƒ/ø‚{hü†B^?}Ô¯˜Î`Öo}‹…Ký/81ã3€‡w¸¼O(ÓO}ßÿý…Y}ÖïâïÖ„vø‚Íÿ‚L°}xh„Gpý�GI&ªþš„uÊ
~íßþœùfèVãGþr(ÿL€äLh‚èoýhO÷ïùÈ‹qª-ù_LêLLÊsBárþï€ $p ABJ< ¹ P!	J
BŒ(q"ÅŠ/b̨q#ÇŽ?‚)r$É’&ÿO¢L©råE@._ÂŒ)3&³>¬nöaËÂ¥^ºz]
«fNf3]Ž”t)ÒN“*}	Õ)Ì©RŸB�IµéS¤R¿Fõ6ìÖ£fϺl02†nß¾
P±†j<áÍÛboE+”èðˆuKÂ,#N¬x1ãÆ+
„LHò`‚�ŸZvš™²æÍ�b–ôg¬‘/K&ýyrèÁ«I¢�
“Ù¸=BÈ;¥B€x캜FFˆ¯|hG0Kžu¹Ø±b­6Ï
ö9XæÔ¯;Ï.­Z‘lá‚—Kq%AV¢O�F‘`ˆ—O£Ö<Ú4hø›ãϯ?ÿþ–'ÿ`}îEdØ{ÿ �ò%x`A©!x a"( �AXÒv²ÕdK7®À
G]°ã[!ºÒ�'F�•\r£Œ²I7clÝ…ôxqU´AèA‚�C)äìu”a…ª]Ø “Ò÷šSRY¥•W>™€	fÉå’jf}6¹d�[Ò`g¦yZ—)mø¢YÌÜ„‹ý‚' DåÔ¢‹,Ú¨ ƒúŽ é¸câM´‚A 2„¤“R*)6Hr”!…O:Xf“z‰¥¨£’ZjJ r	¦›ršÚ‚v*æ«[zÉ&�bšiRœÊTS�¬ôÙ+Q€Îäb¡Ç"›,wkµ¥è¢=>
ÓR€[í´ˆ`꟒¦rÛ­·ß’´-†‡µ	®J0þÙ‡ºêþjçœÆ*¯¼óÎth~:±Â6|ñË×6+ÁŽ¹\°Á#œ0!2ºÈî¯êÊI¯ÄS“½
cœ±ÆsÜ1Ç�þrÅ#“<ïÅ£œ²Ê+³ÜòI%óÌg�ì²Í7㜳Îÿ	ÏܳÏ0×LÑÏg-<´ÑG#�´Ò€½4LM;õÌ I]µÕiq$5ÔWsݵ×No
ö×c+K5ÙgÇôDô–жÛ%ˆ!Ɔa£]·ÝwJ·ÒzãÝwLfûx¡jK4S‡#žøáÛ�³£nÉßUר,tUU¼\å‚Ÿ=ùÑžÓ(ãæœÇ8é§ÃHxD†7«hh•Wìo‰áväDçôèÒ�[�½Ï{9êh{^æÕÉzU¿su¼L—C�ôÍa·¹u×W§ùóÈO§Ýß
¾lªCĺ³‹Â^	ìtÒ¾ûñHžûôeYGÖvÑ�eýQØWßþó›…ö_çxÿáa%YÊ õœ“ÀîM��ÌóŠU4Ç»˜/‚ŒJåê—ÁÊÄt.Q
9j�, 
öXa8Â!
Qh@Ö°Fj(‹À|àC=걃F °bŠhÄ#"1‰J\"›èÄ'&qˆ°âwÐÃæð†²¨aföp…öH
ûQr¨€fY“I¢vôº³Ìî-ë“ë?´‚œïôç¿ú9ƒÜ“àÙÇí’€dã ›ç<àÅHy®
áî8ABZÒ~ø3`&É@=z„ßóˆ"KòÄ|Îz£Yâè–tᲜe	âwÀå
ÒƒŽÔJWþÇ•ÞÊ=p—ì¥ö,ÈÇ]’¥—¿¥)µÆIíè’™3Zà iÌìæ*}´ ýh¼mjs+%(ƒ)M—ˆ°™âC%ATéºØààñшfIK[ªsh�ÌçרÙ3òié(éØ9zEá
](Ck‰G‚B4¢ƒ¨Ì(*Ñ©�ï¢]£Ø4êÑ�ÎÄ¢0)H+6Ð’žÍ q&J[zQ’’¦.M^FgŠ6•î,§:Ý)O{ª!›ÞÔ§B*Q‹jÔÂ
5¥Tz›íÄpÔ§B5ªRÿ
IR•:¥Æ�çqpêT»êÕ¯JµªdÃiDØ‚�³¢­Œ’ˆ+]Y»¶qµ=O:E(“qm¤\Ák]3*°–Š¯‰qšÚŸûØ'±ðYÍhÜÃØÒÌ5Ž}ìš\ƒ±Ž�¬icx*âʬÏ}ï	…6¥šÅŠÆB”e
ƒXË)åJ±QÂÌ„ôZ×>¨±¦Ñ+`‹«¹
¶0_zSl5Å©ßFè´žBn®–«¦ç¾©L·‚f½¦Ù‚p.k�ÈgçXG:ƃ´Ï�ÏšÂÔ™×®R”¤Ë*XÍ•Iµ¢kr×Û[ý4VK„ý«pSEÜ÷⊽ê�áÛ×χ5¡Òëÿk‚Û‘êZ—YçÛ.DºK{~ "
•€é[_39·Ã±y\âÛ7ž/cPµb/ÆÅ–nƒO¥.µÖÀ:žr÷K«á26æÚu	’]U„ò¤ç…í©á›9¿,U~ý‹ÛþD™¿%áíΆLäµ Ìb3…%’P†¢ùÉS^3›ÛŒ0/_­Ènž3�ëÜS8[MÎvÞ3ŸûŒ2<WMÏ~4¡
.@K
§,E4£»&S“6šb'�tϵGS:ÓóÂôÄ8­éÖôÓ>³´²’ô4¤0‡'ÌâiQÃ:oW{u¬'늑&fMkZYiºØ%/záK	M€Ž
ø#¤·^vÌh�<B푘µ5³é•ë—Ù-¾>
yÌ“…Ø!Ü–ØM	, lAE»ÚÕvvé`”Á©|sL¤/
©{û’~ãÄΉÿju㚣ºn�cã# ‰–`:ØA‡@¼GˆÅߎóMq>óšJé¦8?p�²»l÷£Þ%7ïP
ð’Lá 6¹qic�)ûΟ]ýï�KìÚ.É6úÐâ(HUjs(A<J I "éGøEÅHLr¢¼)¸ÄøUpnÓ�+�FÙ„¦¼±õz3oƒõîº×=)¼söÛ椴:Åtžo{&?—Vµü`†»ßÝ�Є&–Þt²G˜Ä_ÍÙþQ¬# gߺÉ-Le6Þš D&8%Ïu—{ÏœÞ{ÚÍ
¯,·g�Ì¢��òµ/¾(ÂXýꉰŠG<‚é÷<í#9ëÿÚo‡Ú¸·‘Ûçå	?”"øÁ'Â'\½ûããsÑÈiç—Ï{�Wl«˜þ-º�;çcÿ%ˆ?Öö#­ûìßúIë>ø½Lþ‰–ŸókOÿŒmè÷Ã?þýaÿóåoÿûã_Tôoþûïÿÿ7ÆþɈû�D(ÔÀéñ2`–ƈ í¯�U™]ä@j`PloÙŠ`À˜’`^×k1–b±b�–gÜ–h¬–|‘ƪxF
ºV•‰¦Ž„­Ò\x@5x€á¡z@
È•l¡Vª‰’lÊaÉ—nÁV	ÚŸi�Ø�×q-ØzµV¬L—�‘	t½×¶d™Fèàj†H ÁuÖxüˆ|Û·­GXˆEIE„¡zaeP!þqØÉÊ	‚!š$—s�‚•†‚5W•Õعœáøð ëôÈ� BÂ%ܥȡªˆ^IÖþ¡ŽíaþÉØfFtµ
Ž™–Ρ�ýV
b�ÿ�D#:¢w¨¡vA¤XË-²@dË'òbÇ”aæv,.‹wˆ™ÍÅ�À@3:ã36£x`/Rc5~1ª‘5jã66f#7‚c8Ò™7š
Šã9¢cÎ�ãQôžÑœß:jÔ;Êý}_#¶ãÐÈ#<FT>NÓþÕãÞãÏð£>Ô@Ú=69‚öZ˜Zz¤ŒÀÔÌäáÝÞ ¤æ
Õ?êàBNZÛ]› ð‹_(�ß3‘ÝäiKVä"]äýLäUR¾á[4áÛ×¥œÔñä#‘œFªßƒ½$ xä*ù\yœÇ¢Çz¤äþtÿìäËÐÙaRUå?ÁŤü\P ™ÓÌEå1‰]ä9Ì!�Ì‘eO¥ö%¤7å;�ÅÁ	%É‘4å½&Q¤]®ÜWRåUb¥ÕHÒÖåe5•]U†EàAÝ
&9AGB`[Ü[>J¤]¥\J]J›0…SË¡�ö,Øy¦_þeÕ(žã)ÓÓM�Ɖ%ã
ÓÉ	ÓåecjÞc®%6‚Þ1Ž™ÏE.Z¶hæȸFF’¦£eeùA¦䌔ž¾ôK¿üÀAp'¢¤Dúÿãmãr–fu6ÚuÎMv®_ErçÔx'¥�gP¾¤9¦ã{ÂçŸ
¥{Æg}Úç›Íç}êç~ªc~ò‡
" _( h�æ æCª•n v`Œ}¡�ž£*¢àŒÅ ® ²àd±`š@Öd¡ “crî_N˜aª¨¡z˜–íÕJ(¡Y!…¾¨Šâ‰ÑpÝ(‰•Öt¹
Y{>¢E"�(åRîâ]íhŠe¢¸<á­ä¡+ΨQõ¡�¢ÊŒÅ—]Ý¡ŒZ™6á‚)¢*¾‚"Ê,"Y£H¢\‰%&‰(r¢â؇b�V)X…b'r)¦¢)îX'ÞØ�‘Sisµ"u©,žèxT¦oV‹.ºh‚�)¤""^*Žè�NÕ/’Ë¥âÌUJ nŠY2.#4’*H£•'¦ª*›yꪺê«ZI«Âê¬Ò*~Èj­âj®ÿ®Ä­f„ò�' ¥§lkU‘(ý•gEýêw'ø+ûë†ìÁ
>' dx&«u.kö5kú�žâx+Hz@ƒf`bg 4浊ϰ>FŠ„mkùIfx€kŠ®(J#uºäåÍH7¡+רëõɤÙÁ¦ÙÝdNÎd9ìs€¦O¦Ýæ©åxd¼j—ϵa’.SÅä$TÞ$ðì%"ES#õë³
æÈ5¬ÑäYZåÿ„eÊ.�ÊnÐÊ1¬T.æ(±'yŠßÛ¡©¶Q,¤°é�dfÆÞÒ]Þfê%^íÈÆT¶>�`-aªœ	’؉ì×étœk÷Ø&Äê£ÄÆoÚ"£N‹.„â+jòQjòkÆq“Ô"“Ò’¬iÆÈâ=Õ…k¢mjzÓVƦjºmBžÃ¢“v¢×òìYÔ€22c©>ã½
mÌ§ÛŽÍ¿–íò½+ø=ëHA®»2­óUnö]nÉHnæúëæR®àÚcÎ~ŽèNé"_çb}êjìâ*¯ÊníÚ®šéíêîîÿ®Nîj8<CÀðoñïñ"oò*ïð†À3€ƒE¯ð.ïôRoõ6ïóBoðVïör¯ñ^ïE,€
D‘où"QÀ\Dôvoûnï÷f¯ôºïü&/üRûÒoþz¯óƯþú/óòoE„ïøšo
Cúªï�êFA8€p
ü@4Pp[ðcpk0+,C-,€°AHD?pOð«ð
¯pp�ðD˜0K0Ûð
W°ƒ°“°DÄ@ƒàCp@ñ#q+ñ3ñóAÈ°Óp
ãpo°ÃpGÄ£°{qc1—°wñÿ›1‡qo1×ð›qkqAüpqÛñã±?1Uù®Eä
88À8€3Lp
ò!#r"+ò"3r#3C-¤
D@@Äò r#kò&s²!?r$OrDX² r4tò)£ò!²$S2Dð�<ˆ¤A?�¨À-ãr.ëò.ór/û²˜Ð€ˆ2 “r&§r2kò*‡r%3&›²2Kó"3s+Ä(Có4k3"W³3_r)os8wsA¼r,Ïr-ûr:«ó:ã20ŸÐ0»®óáÔ
,
pÃĘ̈Àp€Dг=ãóÐìs?ÿ3@×ó=ç³Ì´?GDÿˆ@¤�
+üÀŸL@+4»JCtAhô@ÿŒG#´@/tÌ�4H'´H£Ú™EJDK4E�Ect</ß<A4(C
Ü%ÉÀô@ÀN÷ô†èíÓÆFP5Qûôк´�(µ@@4,@•£¡lGÌH
ô´d4S¯¤ÇªäYD5!5O7uZBÛQDõY5RÊè´5X‹ÎV'LDõTWõ�huZÈW€Wã4òé4Z'­ÿOÈ‚Å\vèØå'mGY»uZ?¶N‚eRó³CC„^[5;bµÅø5h‡6Q¢WGƒ`4]mÑÚdbŽPf4AL6Ì&l2Mc¿5ÿ=žhæ[ÕnS¶É
PŒäu,ï5w�vr÷µrör/÷L˜6js-<vnoÒa&
·Éžå]ÿ6lGÄl�5v3Ç>•5gÓÌ)}vZôµsoHtuc¯6%Ñ÷9I¶jÿtT·\ƒ7Hã÷äé-k3Óv»›Ó.Y÷wLwg_5i·wsC¸lÀ÷`ŸN³
¤µ]§íÚò¶XÎõ…·Å]œ¾ÁÈ}ƒ¸ïФ¾½›lœ÷‚§÷){?wÉxlDC3ü€|õ‰óÒßâ-åÁÛæ˜8†ëö&yåaSå|8‘7-ß9.
ž’'øRó¸Q'öSÏDqS5ƒ{6{
��¶sƒ¹YÿÜxŽí^ĤA-,ƒÑ,C?X>ÈÃ@„š³¹›Ã¹œÓy�¯y›Ká™Å›ÇùœG,Ì€,kÁÏ0C
8k
,D„�ûùϺžGzŸ·t¡T:¡„¤g:¡lúž„§M¨C„¡#º¢3º£Cºé$GÂX€¤
¡Ð­ãz®ëú®óz¯§�pÀCDÄú¬×º¯+û²3{»°{D;­Û:³[ûµ£�³û°;D¤A€ƒôÃ2ü
 €2 {º«ûº³{»»ûº—�3pC 2¤�´Ë:µcû¾7û³s;¾#{µóûÀ뺶C{·Ä´';Á3<®Ùü¿„Â|ÃüÃG{A|{¸�{¹Ÿû»{üÇ{|¼ÏûÔû½»zGvD$
0¤Â0Ì€À|ÌËüÌÓ|ÍÛüÍ‹€<ÐAA$H„ʳ¼ËãüÐ}Ñë<Ïûüϯ|Ë¿|Ñ;ýÓÇüÑ÷üDLCìÌr-ÁÖs}×{ý׃}؃½|p<ñ4LÐ3=Ô³½ÑïüÔ+}Ð7}ÛÓ}ÍK}ÒC„Ú}Ýó½Ìß}ܯ}ßþßGDÕ_}Ö‹}â+þâ×rÙŸ=/0ïJ¾ä£ùä[¾ìVþåk~­fþæ{Z¾«vþç‹~•†þè›>�–þ髾}¦þê»~:¶þëË>8ÆþìÛ~5Öþíëþæþîû~öþïÿÿð¿üÿñ+¡%ÿò;?Ÿ5ÿóKÿœEÿô[ÿ”UÿõkÜ?Xeÿö{Xõñ÷‹›uÿø›¿P•ÿù«¿N¥ÿú»§†ÿûËÿQµÿüÛ¿|FþýëÿPÕÿþ!�	4xaB…6tøbD‰)V´xcÆ„€8vôødH‘#I–4yeJ•+Y~l fL™3iÖ´ygN�;yöôù¨À–C‰5ziÑ—A™6uújT©S©Vµ3iV­[¹vuylX±cÉ–5{­D¯kÙ¶uriZ¹séÖµ{/Ú·{ùöUšp`Áƒ	6<ÐobÅ‹ávürdÉ“­±2¶|ùm\Ê›9wöüÙ.fÑ£·j}ujÕ«o’výz¨iÖ³i׶MvnÝ%eßöýxpÁ»‰çØ[xråË™K5þ<7òæÓ©W·žzvÒÒ¯w÷þý»vñ—¹ƒ7½ïñë—Oÿ~üÍìéóu/~ýxë÷o{¿ð*ÿì
@\�Až|0«œ�Â
-‚C£$´�Ã=,(Ã[ÚðÃMd0 ;



From srichter@cbu.edu  Thu Apr 18 05:57:34 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:57:34 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/locale/en-US Packages/MoZTop/locale/en-US - New directory
Message-ID: <200204180457.g3I4vY826196@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/locale/en-US
In directory cvs.zope.org:/tmp/cvs-serv26121/en-US

Log Message:
Directory /cvs-repository/Packages/MoZTop/locale/en-US added to the repository

=== Added directory Packages/MoZTop/locale/en-US ===




From srichter@cbu.edu  Thu Apr 18 05:57:54 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 00:57:54 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/locale/en-US/zopetop Packages/MoZTop/locale/en-US/zopetop - New directory
Message-ID: <200204180457.g3I4vsX26805@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/locale/en-US/zopetop
In directory cvs.zope.org:/tmp/cvs-serv26608/zopetop

Log Message:
Directory /cvs-repository/Packages/MoZTop/locale/en-US/zopetop added to the repository

=== Added directory Packages/MoZTop/locale/en-US/zopetop ===




From srichter@cbu.edu  Thu Apr 18 06:02:28 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 01:02:28 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/Menu - KeySetOverlay.xul:1.1 MenuOverlay.xul:1.1 ToolBarOverlay.xul:1.1
Message-ID: <200204180502.g3I52SD32759@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/Menu
In directory cvs.zope.org:/tmp/cvs-serv32648/content/zopetop/Menu

Added Files:
	KeySetOverlay.xul MenuOverlay.xul ToolBarOverlay.xul 
Log Message:
This is the original Mozilla ZopeTop code, Paul and I came up over the
weekend, when I was in Fredricksburg. We will use this code as base to
develop a couple of proof of concept screens.


=== Added File Packages/MoZTop/content/zopetop/Menu/KeySetOverlay.xul ===
<?xml version="1.0"?>

<overlay id="KeySetOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
  <keyset id="menu-keyset">
    <key id="new-key" key="N" modifiers="control" oncommand="alert('You have pressed: Ctrl-N')"/>
    <key id="open-key" key="O" modifiers="control" oncommand="alert('You have pressed: Ctrl-O')"/>
    <key id="close-key" key="C" modifiers="control" oncommand="alert('You have pressed: Ctrl-C')"/>
    <key id="save-key" key="S" modifiers="control" oncommand="alert('You have pressed: Ctrl-S')"/>
    <key id="quit-key" key="Q" modifiers="control" oncommand="alert('You have pressed: Ctrl-Q')"/>
  </keyset>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Menu/MenuOverlay.xul ===
<?xml version="1.0"?>

<overlay id="MenuOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
  <menubar id="zopetop-menubar">
    <menu id="file-menu" label="File">
      <menupopup id="file-popup">
        <menuitem label="New Connection" key="new-key"/>
        <menuitem label="Open Connection" key="open-key"/>
        <menuitem label="Close Connection" key="close-key"/>
        <menuitem label="Save Connection" key="quit-key"/>
        <menuseparator/>
        <menuitem label="Quit" key="quit-key"/>
      </menupopup>
    </menu>
    <menu id="edit-menu" label="Edit">
      <menupopup id="edit-popup">
        <menuitem label="Undo"/>
        <menuitem label="Redo"/>
        <menuseparator/>
        <menuitem label="Copy"/>
        <menuitem label="Cut"/>
        <menuitem label="Paste"/>
        <menuseparator/>
        <menuitem label="Preferences"/>
      </menupopup>
    </menu>
    <menu id="edit-menu" label="Views">
      <menupopup id="edit-popup">
        <menuitem id="contents-view" label="Contents" type="checkbox"/>
        <menuitem id="perms-view" label="Permissions" type="checkbox"/>
        <menuitem id="history-view" label="History" type="checkbox"/>
      </menupopup>
    </menu>
    <menu id="edit-menu" label="Help">
      <menupopup id="edit-popup">
        <menuitem label="Index"/>
        <menuitem label="Search"/>
        <menuseparator/>
        <menuitem label="About Zope 3"/>
        <menuitem label="About ZopeTop"/>
      </menupopup>
    </menu>
  </menubar>

</overlay>

=== Added File Packages/MoZTop/content/zopetop/Menu/ToolBarOverlay.xul ===
<?xml version="1.0"?>

<overlay id="ToolBarOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <toolbar id="zopetop-toolbar"
           style="background: url('chrome://communicator/skin/toolbar/prtb-bg-line.gif')">
    <button label="Connect"
            image="chrome://communicator/skin/icons/online.gif"/>
    <button label="Open"
            image="chrome://communicator/skin/directory/file-folder-open.gif" />
    <button onclick="addTask('add', 'Add Item', 'in progress');" label="Add Task" />
    <button onclick="deleteLatestTask();" label="Delete Task" />
    <spring flex="100%" />
    <image src="zopelogo.png" />
    <spacer flex="1" />
  </toolbar>

</overlay>



From srichter@cbu.edu  Thu Apr 18 06:02:27 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 01:02:27 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop - installed-chrome.txt:1.1
Message-ID: <200204180502.g3I52RV32750@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop
In directory cvs.zope.org:/tmp/cvs-serv32648

Added Files:
	installed-chrome.txt 
Log Message:
This is the original Mozilla ZopeTop code, Paul and I came up over the
weekend, when I was in Fredricksburg. We will use this code as base to
develop a couple of proof of concept screens.


=== Added File Packages/MoZTop/installed-chrome.txt ===
content,install,url,resource:/chrome/zopetop/content/zopetop/
content,install,url,resource:/chrome/zopetop/content/zopetop/Data/
content,install,url,resource:/chrome/zopetop/content/zopetop/Menu/
content,install,url,resource:/chrome/zopetop/content/zopetop/Inspector/
content,install,url,resource:/chrome/zopetop/content/zopetop/Main/
content,install,url,resource:/chrome/zopetop/content/zopetop/StatusBar/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/Folder/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/LoadedFolder/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/Image/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/ZPTPage/
content,install,url,resource:/chrome/zopetop/content/zopetop/ContentObjects/File/
locale,install,url,resource:/chrome/zopetop/locale/en-US/zopetop/




From srichter@cbu.edu  Thu Apr 18 06:02:28 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 01:02:28 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/content/zopetop/StatusBar - StatusBarOverlay.xul:1.1 TaskManager.js:1.1 TasksOverlay.xul:1.1 TransactionsOverlay.xul:1.1 errors.gif:1.1 task.gif:1.1
Message-ID: <200204180502.g3I52SK00302@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/content/zopetop/StatusBar
In directory cvs.zope.org:/tmp/cvs-serv32648/content/zopetop/StatusBar

Added Files:
	StatusBarOverlay.xul TaskManager.js TasksOverlay.xul 
	TransactionsOverlay.xul errors.gif task.gif 
Log Message:
This is the original Mozilla ZopeTop code, Paul and I came up over the
weekend, when I was in Fredricksburg. We will use this code as base to
develop a couple of proof of concept screens.


=== Added File Packages/MoZTop/content/zopetop/StatusBar/StatusBarOverlay.xul ===
<?xml version="1.0"?>

<?xul-overlay href="chrome://zopetop/content/StatusBar/TasksOverlay.xul"?>
<?xul-overlay href="chrome://zopetop/content/StatusBar/TransactionsOverlay.xul"?>

<overlay id="StatusBarOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <tabbox id="statusbar"
          orient="horizontal" 
          align="start"
          style="padding: 5px;">

    <tabs orient="vertical">
      <tab label=""
           style="border: 3px solid;
                  border-right: 0px;
  		  border-bottom-width: 3px;
		  -moz-border-top-colors: #000000 #DFE2E6 #D0D7DD;
  		  -moz-border-right-colors: #C7D0D9 #C7D0D9 #C7D0D9;
  		  -moz-border-bottom-colors: #000000 #98A7B5;
  		  -moz-border-left-colors: #000000 #90A0B0 #98A7B5;
  		  -moz-border-radius-topleft: 3px;
  		  -moz-border-radius-topright: 0px;
  		  -moz-border-radius-bottomleft: 3px;
                  width: 24px;
                  height: 24px;
		  background: url('chrome://zopetop/content/StatusBar/task.gif');
                  background-repeat: no-repeat;
		  background-position: center center;"/>
      <tab label=""
           style="border: 3px solid;
                  border-right: 0px;
  		  border-bottom-width: 3px;
		  -moz-border-top-colors: #000000 #DFE2E6 #D0D7DD;
  		  -moz-border-right-colors: #C7D0D9 #C7D0D9 #C7D0D9;
  		  -moz-border-bottom-colors: #000000 #98A7B5;
  		  -moz-border-left-colors: #000000 #90A0B0 #98A7B5;
  		  -moz-border-radius-topleft: 3px;
  		  -moz-border-radius-topright: 0px;
  		  -moz-border-radius-bottomleft: 3px;
                  width: 24px;
                  height: 24px;
		  background: url('chrome://zopetop/content/StatusBar/errors.gif');
                  background-repeat: no-repeat;
		  background-position: center center;"/>
    </tabs>
    <tabpanels style="border-top: 3px solid;
                      border-left: 1px solid;
                      -moz-border-top-colors: #000000 #DFE2E6 #D0D7DD;
                      "
                flex="1">
      <tabpanel id="mailtab"
                orient="vertical"
		height="100"
                flex="1">
        <outliner id="TaskList"/>
      </tabpanel>
      <tabpanel id="newstab">
        <box id="transactions"/>
      </tabpanel>
    </tabpanels>
  </tabbox>
</overlay>

=== Added File Packages/MoZTop/content/zopetop/StatusBar/TaskManager.js ===
var RDF =
  Components
  .classes["@mozilla.org/rdf/rdf-service;1"]
  .getService(Components.interfaces.nsIRDFService);

var DS =
  Components
  .classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
  .createInstance(Components.interfaces.nsIRDFDataSource);

function initTaskList() {
    addTask('init', 'Initial Task', 'done');

    // Add the datasource to the outliner
    var outliner = document.getElementById("TaskList");
    outliner.database.AddDataSource(DS);
    outliner.setAttribute("ref", "urn:tasks:root");
}

// This will remember the index of the last child we've added
var taskCount = 0;

function addTask(name, description, status) {
    // Add a new child urn:tasks:1.x beneath urn:tasks:1.
    DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
              RDF.GetResource("http://home.netscape.com/NC-rdf#taskid"),
              RDF.GetLiteral(taskCount),
              true);
      
    DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
              RDF.GetResource("http://home.netscape.com/NC-rdf#name"),
              RDF.GetLiteral(name),
              true);

    DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
              RDF.GetResource("http://home.netscape.com/NC-rdf#descr"),
              RDF.GetLiteral(description),
              true);

    DS.Assert(RDF.GetResource("urn:tasks:" + taskCount),
              RDF.GetResource("http://home.netscape.com/NC-rdf#status"),
              RDF.GetLiteral(status),
              true);

    DS.Assert(RDF.GetResource("urn:tasks:root"),
              RDF.GetResource("http://home.netscape.com/NC-rdf#child"),
              RDF.GetResource("urn:tasks:" + taskCount),
              true);

    ++taskCount;
}

function deleteTask(taskid) {
    DS.Unassert(RDF.GetResource("urn:tasks:root"),
                RDF.GetResource("http://home.netscape.com/NC-rdf#child"),
                RDF.GetResource("urn:tasks:" + taskid),
                true);

}

function deleteLatestTask() {
    deleteTask(taskCount-1);
}


=== Added File Packages/MoZTop/content/zopetop/StatusBar/TasksOverlay.xul ===
<?xml version="1.0"?>

<overlay id="TasksOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

    <outliner flex="1" id="TaskList" datasources="rdf:null"
              flags="dont-build-content"
              containment="http://home.netscape.com/NC-rdf#child">

      <outlinercols>
        <outlinercol id="taskid" flex="1" label="Id" sort="?taskid"
                     primary="true" />
        <splitter/>
        <outlinercol id="name" label="Name" sort="?name" flex="2"/>
        <splitter/>
        <outlinercol id="description" label="Description" sort="?descr" flex="10"/>
        <splitter/>
        <outlinercol id="status" label="Status" sort="?status" flex="3"/>
      </outlinercols>

      <template>
        <rule>
          <conditions>
            <outlineritem uri="?uri" />
            <member container="?uri" child="?task" />
          </conditions>
  
          <bindings>
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#taskid"
                     object="?taskid" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#name"
                     object="?name" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#descr"
                     object="?descr" />
            <binding subject="?task"
                     predicate="http://home.netscape.com/NC-rdf#status"
                     object="?status" />
          </bindings>
  
          <action>
            <outlinerchildren>
              <outlineritem uri="?task">
                <outlinerrow>
                  <outlinercell label="?taskid" />
                  <outlinercell label="?name" />
                  <outlinercell label="?descr" />
                  <outlinercell label="?status" />
                </outlinerrow>
              </outlineritem>
            </outlinerchildren>
          </action>
        </rule>
      </template>

    </outliner>

</overlay>


=== Added File Packages/MoZTop/content/zopetop/StatusBar/TransactionsOverlay.xul ===
<?xml version="1.0"?>

<overlay id="TransactionsOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <box id="transactions"
       orient="vertical"
       flex="1">

  <outliner id="transaction-grid" flex="1" 
            datasources="tasks.rdf" 
	    ref="urn:tasks:data">
    <outlinercols>
      <outlinercol id="taskid" label="Task Id" flex="2"/>
      <splitter/>
      <outlinercol id="description" label="Description" flex="10"/>
      <splitter/>
      <outlinercol id="progress" label="Progress" flex="3"/>
    </outlinercols>
     
    <template>
      <rule>
        <conditions>
          <content uri="?list"/>
          <member container="?list" child="?child"/>
          <triple subject="?child"
                  predicate="http://www.zope.org/rdf#taskid"
                  object="?taskid"/>
        </conditions>
        <bindings>
          <binding subject="?child"
                   predicate="http://www.zope.org/rdf#taskid"
                   object="?taskid"/>
          <binding subject="?child"
                   predicate="http://www.zope.org/rdf#description"
                   object="?description"/>
          <binding subject="?child"
                   predicate="http://www.zope.org/rdf#progress"
                   object="?progress"/>
        </bindings>
        <action>
          <outlinerchildren>
            <outlineritem uri="?child">
              <outlinerrow>
                <outlinercell label="?taskid"/>
                <outlinercell label="?description"/>
                <outlinercell label="?progress"/>
              </outlinerrow>
            </outlineritem>
          </outlinerchildren>
        </action>
      </rule>
    </template>
  </outliner>

  <box orient="horizontal">
    <spacer flex="100%"/>
    <button label="Undo" />
    <button label="Redo" />
    <button label="Dismiss" />
    <button label="Retrieve" />
  </box>

  </box>

</overlay>


=== Added File Packages/MoZTop/content/zopetop/StatusBar/errors.gif ===
  <Binary-ish file>

=== Added File Packages/MoZTop/content/zopetop/StatusBar/task.gif ===
  <Binary-ish file>



From srichter@cbu.edu  Thu Apr 18 06:02:28 2002
From: srichter@cbu.edu (Stephan Richter)
Date: Thu, 18 Apr 2002 01:02:28 -0400
Subject: [Zope-CVS] CVS: Packages/MoZTop/locale/en-US/zopetop - contents.rdf:1.1 zopetop.dtd:1.1 zopetop.properties:1.1 zopetopOverlay.dtd:1.1
Message-ID: <200204180502.g3I52S200305@cvs.baymountain.com>

Update of /cvs-repository/Packages/MoZTop/locale/en-US/zopetop
In directory cvs.zope.org:/tmp/cvs-serv32648/locale/en-US/zopetop

Added Files:
	contents.rdf zopetop.dtd zopetop.properties zopetopOverlay.dtd 
Log Message:
This is the original Mozilla ZopeTop code, Paul and I came up over the
weekend, when I was in Fredricksburg. We will use this code as base to
develop a couple of proof of concept screens.


=== Added File Packages/MoZTop/locale/en-US/zopetop/contents.rdf ===
<?xml version="1.0"?> 

<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
         xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> 

  <RDF:Seq about="urn:mozilla:locale:root"> 
    <RDF:li resource="urn:mozilla:locale:en-US"/> 
  </RDF:Seq> 

  <RDF:Description about="urn:mozilla:locale:en-US"> 
    <chrome:packages> 
      <RDF:Seq about="urn:mozilla:locale:en-US:packages"> 
        <RDF:li resource="urn:mozilla:locale:en-US:zopetop"/> 
      </RDF:Seq> 
    </chrome:packages> 
  </RDF:Description> 

</RDF:RDF> 

=== Added File Packages/MoZTop/locale/en-US/zopetop/zopetop.dtd ===
<!ENTITY window.title               "Untitled - XulNote"> 

<!ENTITY menu-file:label              "File">
<!ENTITY menu-file:accesskey          "F">
<!ENTITY menu-file-new:key            "N">
<!ENTITY menu-file-new:label          "New">
<!ENTITY menu-file-new:accesskey      "N">
<!ENTITY menu-file-open:key           "O">
<!ENTITY menu-file-open:label         "Open">
<!ENTITY menu-file-open:accesskey     "O">
<!ENTITY menu-file-reopen:label       "Reopen">
<!ENTITY menu-file-reopen:accesskey   "R">
<!ENTITY menu-file-save:key           "S">
<!ENTITY menu-file-save:label         "Save">
<!ENTITY menu-file-save:accesskey     "S">
<!ENTITY menu-file-saveas:key         "">
<!ENTITY menu-file-saveas:label       "Save As...">
<!ENTITY menu-file-saveas:accesskey   "A">
<!ENTITY menu-file-close:key          "W">
<!ENTITY menu-file-close:label        "Close">
<!ENTITY menu-file-close:accesskey    "C">

<!ENTITY menu-view:label              "View">
<!ENTITY menu-view:accesskey          "V">
<!ENTITY menu-view-wordwrap:key       "">
<!ENTITY menu-view-wordwrap:label     "Word Wrap">
<!ENTITY menu-view-wordwrap:accesskey "W">

=== Added File Packages/MoZTop/locale/en-US/zopetop/zopetop.properties ===
programTitle=XulNote
newFileTitle=Untitled
windowTitleSeparator=-

saveWindowTitle=Save File
openWindowTitle=Open File

warningDialogTitle=Save File
warningDialogNew=  Save changes to existing file before creating a new one?
warningDialogOpen= Save changes to existing file before opening a different one?
warningDialogClose=Save changes to file before closing?

readErrorMessage= File Read Error: 
writeErrorMessage=File Write Error: 

=== Added File Packages/MoZTop/locale/en-US/zopetop/zopetopOverlay.dtd ===
<!ENTITY menu-tasks-zopetop:label  "ZopeTop for Zope 3">



From chrisw@nipltd.com  Fri Apr 19 15:52:15 2002
From: chrisw@nipltd.com (Chris Withers)
Date: Fri, 19 Apr 2002 10:52:15 -0400
Subject: [Zope-CVS] CVS: Packages/TestScripts - autotester.py:1.9
Message-ID: <200204191452.g3JEqFC17419@cvs.baymountain.com>

Update of /cvs-repository/Packages/TestScripts
In directory cvs.zope.org:/tmp/cvs-serv17411

Modified Files:
	autotester.py 
Log Message:
More accurate notification of numbers of failures and errors.

=== Packages/TestScripts/autotester.py 1.8 => 1.9 ===
 
 # send the mail
-failed_re = compile('OVERALL FAILED \(total failures=(?P<failed>\d+)(?:, total errors=(?P<errored>\d+))?')
+failed_re = compile('FAILED \(failures=(\d+)(?:, errors=(\d+))?')
 email = config['email'][0]
 for address,body in emails.items():    
     subject = email['subject'][0]()
     content = body.getvalue()
-    m = failed_re.search(content)
-    if m:
-        for key,value in m.groupdict().items():
-            if value:
-                subject += ', %s %s' % (value,key)
+
+    failures = 0
+    errors = 0
+    for f, e in failed_re.findall(content):
+        if f:
+            failures += int(f)
+        if e:
+            errors += int(e)
+    
+    if failures:
+        subject += ' failures:' + `failures`
+    if errors:
+        subject += ' errors:' + `errors`
+    if not(errors or failures):
+        subject += ' OK :-)'
+
     send(address,
          subject,
          content,




From chrisw@nipltd.com  Fri Apr 19 16:31:38 2002
From: chrisw@nipltd.com (Chris Withers)
Date: Fri, 19 Apr 2002 11:31:38 -0400
Subject: [Zope-CVS] CVS: Packages/TestScripts - autotester.py:1.10
Message-ID: <200204191531.g3JFVcd27782@cvs.baymountain.com>

Update of /cvs-repository/Packages/TestScripts
In directory cvs.zope.org:/tmp/cvs-serv27774

Modified Files:
	autotester.py 
Log Message:
Truncation for when things are really badly funked up.

=== Packages/TestScripts/autotester.py 1.9 => 1.10 ===
         subject += ' OK :-)'
 
+    n = 10000
+    if len(content)>n:
+        content = content[:n] + '\n<truncated>'
+        
     send(address,
          subject,
          content,




From klm@zope.com  Wed Apr 24 21:46:03 2002
From: klm@zope.com (Ken Manheimer)
Date: Wed, 24 Apr 2002 16:46:03 -0400
Subject: [Zope-CVS] CVS: CVSROOT - cvswrappers:1.12
Message-ID: <200204242046.g3OKk3W00731@cvs.baymountain.com>

Update of /cvs-repository/CVSROOT
In directory cvs.zope.org:/tmp/cvs-serv684

Modified Files:
	cvswrappers 
Log Message:
Much more comprehensive list of extensions for files to be treated as
binary, *including* many file types that typically would not be
checked into CVS.  (This is necessary for situations where you
actually want those files checked in - eg, and image of an operating
installation...)


=== CVSROOT/cvswrappers 1.11 => 1.12 ===
 *.jpg -k 'b'
 *.png -k 'b'
+*.ico -k 'b'
+*.mov -k 'b'
+*.swf -k 'b'
 *.so  -k 'b'
 *.dll -k 'b'
 *.pyd -k 'b'
+*.pyc -k 'b'
+*.pys -k 'b'
+*.psd -k 'b'
+*.exe -k 'b'
+*.fs  -k 'b'
+*.fs.index  -k 'b'
+*.fs.tmp  -k 'b'
+*.zexp -k 'b'
+*.ps  -k 'b'
+*.eps -k 'b'
+*.tgz -k 'b'
+*.gz  -k 'b'
+*.zip -k 'b'




From chrism@zope.com  Mon Apr 29 16:42:22 2002
From: chrism@zope.com (Chris McDonough)
Date: Mon, 29 Apr 2002 11:42:22 -0400
Subject: [Zope-CVS] CVS: Products/Rewriter Products/Rewriter - Imported sources
Message-ID: <200204291542.g3TFgMK09651@cvs.baymountain.com>

Update of /cvs-repository/Products/Rewriter
In directory cvs.zope.org:/tmp/cvs-serv9644

Log Message:
vendor import

Status:

Vendor Tag:	zc
Release Tags:	start
		
N Products/Rewriter/Rewriter.py
N Products/Rewriter/RewriterFolder.py
N Products/Rewriter/RewriterItem.py
N Products/Rewriter/__init__.py
N Products/Rewriter/test.py
N Products/Rewriter/dtml/addRewriter.dtml
N Products/Rewriter/dtml/addRewriterFolder.dtml
N Products/Rewriter/dtml/addRewriterItem.dtml
N Products/Rewriter/dtml/manageFolderworkspace.dtml
N Products/Rewriter/dtml/manageMain.dtml
N Products/Rewriter/dtml/manageRewriter.dtml
N Products/Rewriter/dtml/manageRewriterFolder.dtml
N Products/Rewriter/dtml/manageRewriterItem.dtml
N Products/Rewriter/dtml/manageStatistics.dtml
N Products/Rewriter/dtml/out
N Products/Rewriter/help/placeholder.txt
N Products/Rewriter/www/rewriter.gif
N Products/Rewriter/www/rewriterfolder.gif
N Products/Rewriter/www/rewriteritem.gif

No conflicts created by this import




From jim@zope.com  Tue Apr 30 17:58:50 2002
From: jim@zope.com (Jim Fulton)
Date: Tue, 30 Apr 2002 12:58:50 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex Products/ZCTextIndex - New directory
Message-ID: <200204301658.g3UGwoK19774@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv19766/ZCTextIndex

Log Message:
Directory /cvs-repository/Products/ZCTextIndex added to the repository
--> Using per-directory sticky tag `TextIndexDS9-branch'

=== Added directory Products/ZCTextIndex ===




From jim@zope.com  Tue Apr 30 18:00:46 2002
From: jim@zope.com (Jim Fulton)
Date: Tue, 30 Apr 2002 13:00:46 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests Products/ZCTextIndex/tests - New directory
Message-ID: <200204301700.g3UH0ki20528@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv20521/tests

Log Message:
Directory /cvs-repository/Products/ZCTextIndex/tests added to the repository
--> Using per-directory sticky tag `TextIndexDS9-branch'

=== Added directory Products/ZCTextIndex/tests ===




From jim@zope.com  Tue Apr 30 18:04:50 2002
From: jim@zope.com (Jim Fulton)
Date: Tue, 30 Apr 2002 13:04:50 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - __init__.py:1.1.2.1
Message-ID: <200204301704.g3UH4oH22555@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv22461

Added Files:
      Tag: TextIndexDS9-branch
	__init__.py 
Log Message:
Set up workspace for new TextIndex work.


=== Added File Products/ZCTextIndex/__init__.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################
"""ZCatalog Text Index

Experimental plugin text index for ZCatalog.

Revision information:
$Id: __init__.py,v 1.1.2.1 2002/04/30 17:04:49 jim Exp $
"""





From jim@zope.com  Tue Apr 30 18:04:50 2002
From: jim@zope.com (Jim Fulton)
Date: Tue, 30 Apr 2002 13:04:50 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - __init__.py:1.1.2.1 mailtest.py:1.1.2.1
Message-ID: <200204301704.g3UH4oU22559@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv22461/tests

Added Files:
      Tag: TextIndexDS9-branch
	__init__.py mailtest.py 
Log Message:
Set up workspace for new TextIndex work.


=== Added File Products/ZCTextIndex/tests/__init__.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################
"""

Revision information:
$Id: __init__.py,v 1.1.2.1 2002/04/30 17:04:50 jim Exp $
"""



=== Added File Products/ZCTextIndex/tests/mailtest.py ===
import ZODB
import ZODB.FileStorage
from Products.PluginIndexes.TextIndex.TextIndex import TextIndex

import mailbox
import time

class Message:

    total_bytes = 0
    
    def __init__(self, msg):
        self.msg = msg

    def text(self):
        buf = self.msg.fp.read()
        Message.total_bytes += len(buf)
        return buf

def main(inp, out):
    global NUM
    idx_time = 0
    pack_time = 0
    
    f = ZODB.FileStorage.FileStorage(out)
    db = ZODB.DB(f)
    cn = db.open()
    rt = cn.root()
    rt["index"] = idx = TextIndex("text")
    get_transaction().commit()

    mbox = mailbox.UnixMailbox(open(inp))
    if VERBOSE:
        print "opened", inp
    if not NUM:
        NUM = sys.maxint
    i = 0
    while i < NUM:
        i += 1
        msg = Message(mbox.next())
        i0 = time.clock()
        idx.index_object(i, msg)
        get_transaction().commit()
        i1 = time.clock()
        idx_time += i1 - i0
        if VERBOSE and i % 50 == 0:
            print i, "messages indexed"
        if i % PACK_INTERVAL == 0:
            p0 = time.clock()
            db.pack(time.time())
            p1 = time.clock()
            print "pack took %s sec" % (p1 - p0)
            pack_time += p1 - p0
    return idx_time, pack_time

if __name__ == "__main__":
    import sys
    import getopt

    NUM = 0
    VERBOSE = 0
    PACK_INTERVAL = 500
    opts, args = getopt.getopt(sys.argv[1:], 'vn:p:')
    for o, v in opts:
        if o == '-n':
            NUM = int(v)
        elif o == '-v':
            VERBOSE += 1
        elif o == '-p':
            PACK_INTERVAL = int(v)
    inp, out = args
    ti, tp = main(inp, out)
    print "Index time", ti
    print "Index bytes", Message.total_bytes




From tseaver@zope.com  Tue Apr 30 19:26:42 2002
From: tseaver@zope.com (Tres Seaver)
Date: Tue, 30 Apr 2002 14:26:42 -0400
Subject: [Zope-CVS] CVS: Packages/FunctionalTests - CHANGES.txt:1.4
Message-ID: <200204301826.g3UIQgt32724@cvs.baymountain.com>

Update of /cvs-repository/Packages/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv32714

Modified Files:
	CHANGES.txt 
Log Message:
 - Prep for release.

=== Packages/FunctionalTests/CHANGES.txt 1.3 => 1.4 ===
 
+  Release 0.3 -- 2002/04/30
+
     - Framework: Modified Result to propagate cookies through entire
       result tree.
 




From fdrake@acm.org  Tue Apr 30 21:19:44 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 16:19:44 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - Index.py:1.1.2.1
Message-ID: <200204302019.g3UKJiN16971@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv16959

Added Files:
      Tag: TextIndexDS9-branch
	Index.py 
Log Message:
First portion of new index.

=== Added File Products/ZCTextIndex/Index.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################
"""Text Index.

Plugin text index for ZCatalog, with relevance ranking.

Revision information:
$Id: Index.py,v 1.1.2.1 2002/04/30 20:19:43 fdrake Exp $
"""

import math

from BTrees.IOBTree import IOBTree
from BTrees.IIBTree import IIBTree, IISet


class Index:
    def __init__(self, lexicon, fieldname):
        self._lexicon = lexicon
        self._fieldname = fieldname

        # wid -> ( doc-frequency, { docid -> frequency } )
        self._wordinfo = IOBTree()

        # docid -> W
        self._docweight = IIBTree()

        # docid -> [ wid ]
        # used for un-indexing
        self._docwords = IOBTree()

    def index_object(self, docid, obj, threshold=None):
        wids = self._lexicon.textToWordIDs(self._get_object_text(obj))
        freqs, docweight = self._get_frequencies(wids)
        uniqwids = []
        for wid, f in freqs:
            self._add_wordinfo(wid, f, docid)
            uniqwids.append(wid)
        self._docweight[docid] = docweight
        self._docwords[docid] = IISet(uniqwids)

    def unindex_object(self, docid):
        wids = self._docwords[docid]
        for wid in wids:
            self._del_wordinfo(wid, docid)
        del self._docwords[docid]
        del self._docweight[docid]

    def _get_object_text(self, obj):
        x = getattr(obj, self._fieldname)
        if callable(x):
            return x()
        else:
            return x

    def _get_frequencies(self, wids):
        d = {}
        for wid in wids:
            d[wid] = d.get(wid, 0) + 1
        Wsquares = 0
        freqs = []
        for wid, count in d.items():
            f = frequency(count)
            Wsquares += f ** 2
            freqs.append((wid, f))
        return freqs, int(math.sqrt(Wsquares))

    def _add_wordinfo(self, wid, f, docid):
        try:
            olddocfreq, map = self._wordinfo[wid]
        except KeyError:
            olddocfreq = 0
            map = IIBTree()
        map[docid] = f
        self._wordinfo[wid] = olddocfreq + 1, map

    def _del_wordinfo(self, wid, docid):
        olddocfreq, map = self._wordinfo[wid]
        if olddocfreq == 1:
            del self._wordinfo[wid]
            return
        del map[docid]
        self._wordinfo[wid] = olddocfreq - 1, map


def frequency(count):
    return count




From fdrake@acm.org  Tue Apr 30 21:19:44 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 16:19:44 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - test_index.py:1.1.2.1
Message-ID: <200204302019.g3UKJis16974@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv16959/tests

Added Files:
      Tag: TextIndexDS9-branch
	test_index.py 
Log Message:
First portion of new index.

=== Added File Products/ZCTextIndex/tests/test_index.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################
"""

Revision information:
$Id: test_index.py,v 1.1.2.1 2002/04/30 20:19:43 fdrake Exp $
"""

from unittest import TestCase, TestSuite, main, makeSuite

from Products.ZCTextIndex.Index import Index


class SimpleLexicon:
    def __init__(self):
        self._words = {}

    def textToWordIDs(self, text):
        words = text.split()
        wids = []
        for word in words:
            wid = self._words.get(word)
            if wid is None:
                wid = len(self._words)
                self._words[word] = wid
            wids.append(wid)
        return wids


class Indexable:
    def __init__(self, text):
        self.text = text

class MethodIndexable:
    def __init__(self, text):
        self._text = text

    def text(self):
        return self._text


class IndexTest(TestCase):
    def setUp(self):
        self.lexicon = SimpleLexicon()
        self.index = Index(self.lexicon, "text")

    def test_index_document(self):
        doc = Indexable("this is a simple document")
        DOCID = 1
        self.index.index_object(DOCID, doc)
        self.assert_(self.index._docweight[DOCID])
        self.assertEqual(len(self.index._wordinfo), 5)
        self.assertEqual(len(self.index._docwords), 1)
        self.assertEqual(len(self.index._docwords[DOCID]), 5)
        for docfreq, map in self.index._wordinfo.values():
            self.assertEqual(docfreq, 1)
            self.assertEqual(len(map), 1)
            self.assert_(map.has_key(DOCID))


def test_suite():
    return makeSuite(IndexTest)

if __name__=='__main__':
    main(defaultTest='test_suite')




From guido@python.org  Tue Apr 30 21:20:15 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 16:20:15 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - IQueryParser.py:1.1.2.1 QueryParser.py:1.1.2.1
Message-ID: <200204302020.g3UKKFH17078@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv17061

Added Files:
      Tag: TextIndexDS9-branch
	IQueryParser.py QueryParser.py 
Log Message:
Query Parser.

=== Added File Products/ZCTextIndex/IQueryParser.py ===
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################

"""Query Parser Interface."""

import Interface

class IQueryParser(Interface.Base):
    """Interface for Query Parsers."""

    def parseQuery(query):
        """Parse a query string.

        Return a parse tree (which implements IQueryParseTree).
        """

class IQueryParseTree(Interface.Base):
    """Interface for parse trees returned by parseQuery()."""

    def nodeType():
        """Return the node type.

        This is one of 'AND', 'OR', 'NOT', or 'ATOM'.
        """

    def getValue():
        """Return a node-type specific value.

        For node type:    Return:
        'AND'             a list of parse trees
        'OR'              a list of parse trees
        'NOT'             a parse tree
        'ATOM'            a string
        """


=== Added File Products/ZCTextIndex/QueryParser.py ===
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################

"""Query Parser."""

import re

class ParseError(Exception):
    pass

class QueryParser:

    def __init__(self):
        pass # This parser has no persistent state

    def parseQuery(self, query):
        # Lexical analysis
        tokens = re.findall(r"[()]|[^\s()]+", query)
        self.__tokens = tokens
        self.__tokens.append(None) # EOF token
        self.__index = 0
        # Syntactical analysis
        tree = self._parseOrExpr()
        self._require(None)
        return tree

    # Recursive descent parser

    def _require(self, token):
        if not self._check(token):
            t = self.__tokens[self.__index]
            raise ParseError, "Token %r required, %r found" % (token, t)

    def _check(self, token):
        if self.__tokens[self.__index] == token:
            self.__index += 1
            return 1
        else:
            return 0

    def _get(self):
        t = self.__tokens[self.__index]
        self.__index += 1
        return t

    def _parseOrExpr(self):
        L = []
        L.append(self._parseAndExpr())
        while self._check("OR"):
            L.append(self._parseAndExpr())
        if len(L) == 1:
            return L[0]
        else:
            return OrNode(L)

    def _parseAndExpr(self):
        L = []
        L.append(self._parseNotExpr())
        while self._check("AND"):
            L.append(self._parseNotExpr())
        if len(L) == 1:
            return L[0]
        else:
            return AndNode(L)

    def _parseNotExpr(self):
        if self._check("NOT"):
            return NotNode(self._parseTerm())
        else:
            return self._parseTerm()

    def _parseTerm(self):
        if self._check("("):
            tree = self._parseOrExpr()
            self._require(")")
        else:
            t = self._get()
            if t in [")", "AND", "OR", "NOT", None]:
                raise ParseError("Token %r not expected" % t)
            tree = AtomNode(t)
        return tree


class ParseTreeNode:

    _nodeType = None

    def __init__(self, value):
        self._value = value

    def nodeType(self):
        return self._nodeType

    def getValue(self):
        return self._value

class NotNode(ParseTreeNode):

    _nodeType = "NOT"

class AndNode(ParseTreeNode):

    _nodeType = "AND"

class OrNode(ParseTreeNode):

    _nodeType = "OR"

class AtomNode(ParseTreeNode):

    _nodeType = "ATOM"




From guido@python.org  Tue Apr 30 21:20:15 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 16:20:15 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - testQueryParser.py:1.1.2.1
Message-ID: <200204302020.g3UKKFP17082@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv17061/tests

Added Files:
      Tag: TextIndexDS9-branch
	testQueryParser.py 
Log Message:
Query Parser.

=== Added File Products/ZCTextIndex/tests/testQueryParser.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################

from unittest import TestCase, TestSuite, main, makeSuite

from Products.ZCTextIndex.QueryParser import \
     QueryParser, ParseTreeNode, OrNode, AndNode, NotNode, AtomNode

class TestQueryParser(TestCase):

    def compareParseTrees(self, got, expected):
        self.assertEqual(isinstance(got, ParseTreeNode), 1)
        self.assertEqual(got.__class__, expected.__class__)
        if isinstance(got, AtomNode):
            self.assertEqual(got.nodeType(), "ATOM")
            self.assertEqual(got.getValue(), expected.getValue())
        elif isinstance(got, NotNode):
            self.assertEqual(got.nodeType(), "NOT")
            self.compareParseTrees(got.getValue(), expected.getValue())
        elif isinstance(got, AndNode) or isinstance(got, OrNode):
            self.assertEqual(got.nodeType(),
                             isinstance(got, AndNode) and "AND" or "OR")
            list1 = got.getValue()
            list2 = expected.getValue()
            self.assertEqual(len(list1), len(list2))
            for i in range(len(list1)):
                self.compareParseTrees(list1[i], list2[i])

    def expect(self, input, output):
        tree = self.p.parseQuery(input)
        self.compareParseTrees(tree, output)

    def setUp(self):
        self.p = QueryParser()

    def testParseQuery(self):
        self.expect("foo", AtomNode("foo"))
        self.expect("NOT foo", NotNode(AtomNode("foo")))
        self.expect("not", AtomNode("not"))
        self.expect("a AND b AND c",
                    AndNode([AtomNode("a"), AtomNode("b"), AtomNode("c")]))
        self.expect("a OR b OR c",
                    OrNode([AtomNode("a"), AtomNode("b"), AtomNode("c")]))
        self.expect("a AND b OR c AND d",
                    OrNode([AndNode([AtomNode("a"), AtomNode("b")]),
                            AndNode([AtomNode("c"), AtomNode("d")])]))
        self.expect("(a OR b) AND (c OR d)",
                    AndNode([OrNode([AtomNode("a"), AtomNode("b")]),
                             OrNode([AtomNode("c"), AtomNode("d")])]))
        self.expect("a AND NOT b",
                    AndNode([AtomNode("a"), NotNode(AtomNode("b"))]))
                    

def test_suite():
    return TestSuite((
        makeSuite(TestQueryParser),
        ))

if __name__=='__main__':
    main(defaultTest='test_suite')




From fdrake@acm.org  Tue Apr 30 21:24:18 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 16:24:18 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - test_index.py:1.1.2.2
Message-ID: <200204302024.g3UKOIY18278@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv18270/tests

Modified Files:
      Tag: TextIndexDS9-branch
	test_index.py 
Log Message:
First portion of new index.

=== Products/ZCTextIndex/tests/test_index.py 1.1.2.1 => 1.1.2.2 ===
         self.index = Index(self.lexicon, "text")
 
-    def test_index_document(self):
+    def test_index_document(self, DOCID=1):
         doc = Indexable("this is a simple document")
-        DOCID = 1
         self.index.index_object(DOCID, doc)
         self.assert_(self.index._docweight[DOCID])
         self.assertEqual(len(self.index._wordinfo), 5)
@@ -67,6 +66,14 @@
             self.assertEqual(docfreq, 1)
             self.assertEqual(len(map), 1)
             self.assert_(map.has_key(DOCID))
+
+    def test_unindex_document(self):
+        DOCID = 1
+        self.test_index_document(DOCID)
+        self.index.unindex_object(DOCID)
+        self.assertEqual(len(self.index._docweight), 0)
+        self.assertEqual(len(self.index._wordinfo), 0)
+        self.assertEqual(len(self.index._docwords), 0)
 
 
 def test_suite():




From guido@python.org  Tue Apr 30 21:30:37 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 16:30:37 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - QueryParser.py:1.1.2.2
Message-ID: <200204302030.g3UKUbV19673@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv19665

Modified Files:
      Tag: TextIndexDS9-branch
	QueryParser.py 
Log Message:
Add a comment showing the syntax supported by the query parser.


=== Products/ZCTextIndex/QueryParser.py 1.1.2.1 => 1.1.2.2 ===
 ##############################################################################
 
-"""Query Parser."""
+"""Query Parser.
+
+This particular parser recognizes the following syntax:
+
+Start = OrExpr
+OrExpr = AndExpr ('OR' AndExpr)*
+AndExpr = NotExpr ('AND' NotExpr)*
+NotExpr = ['NOT'] Term
+Term = '(' OrExpr ')' | ATOM
+
+An ATOM is a string not containing whitespace or parentheses, and not
+equal to one of the key words 'AND', 'OR', 'NOT'.  The key words are
+only recognized in all upper case.
+
+"""
 
 import re
 




From guido@python.org  Tue Apr 30 21:36:36 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 16:36:36 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - testQueryParser.py:1.1.2.2
Message-ID: <200204302036.g3UKaaG21045@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv21037

Modified Files:
      Tag: TextIndexDS9-branch
	testQueryParser.py 
Log Message:
Add tests for illegal syntax.

Simplify test_suite().


=== Products/ZCTextIndex/tests/testQueryParser.py 1.1.2.1 => 1.1.2.2 ===
 
 from Products.ZCTextIndex.QueryParser import \
-     QueryParser, ParseTreeNode, OrNode, AndNode, NotNode, AtomNode
+     QueryParser, ParseError, ParseTreeNode, OrNode, AndNode, NotNode, AtomNode
 
 class TestQueryParser(TestCase):
 
@@ -41,6 +41,9 @@
         tree = self.p.parseQuery(input)
         self.compareParseTrees(tree, output)
 
+    def failure(self, input):
+        self.assertRaises(ParseError, self.p.parseQuery, input)
+
     def setUp(self):
         self.p = QueryParser()
 
@@ -60,12 +63,27 @@
                              OrNode([AtomNode("c"), AtomNode("d")])]))
         self.expect("a AND NOT b",
                     AndNode([AtomNode("a"), NotNode(AtomNode("b"))]))
-                    
+
+    def testParseFailures(self):
+        self.failure("")
+        self.failure("OR")
+        self.failure("AND")
+        self.failure("NOT")
+        self.failure(")")
+        self.failure("(")
+        self.failure("foo bar")
+        self.failure("foo OR")
+        self.failure("foo AND")
+        self.failure("OR foo")
+        self.failure("AND foo")
+        self.failure("(foo bar)")
+        self.failure("(foo OR)")
+        self.failure("(foo AND)")
+        self.failure("(NOT)")
+
 
 def test_suite():
-    return TestSuite((
-        makeSuite(TestQueryParser),
-        ))
+    return makeSuite(TestQueryParser)
 
 if __name__=='__main__':
     main(defaultTest='test_suite')




From fdrake@acm.org  Tue Apr 30 21:47:45 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 16:47:45 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - test_index.py:1.1.2.3
Message-ID: <200204302047.g3UKljQ24552@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv24544/tests

Modified Files:
      Tag: TextIndexDS9-branch
	test_index.py 
Log Message:
Add tests that involve multiple documents.
Add a test that makes sure documents with repeated words properly.


=== Products/ZCTextIndex/tests/test_index.py 1.1.2.2 => 1.1.2.3 ===
 # 
 ##############################################################################
-"""
-
-Revision information:
-$Id$
-"""
 
 from unittest import TestCase, TestSuite, main, makeSuite
 
@@ -74,6 +69,57 @@
         self.assertEqual(len(self.index._docweight), 0)
         self.assertEqual(len(self.index._wordinfo), 0)
         self.assertEqual(len(self.index._docwords), 0)
+
+    def test_index_two_documents(self):
+        self.test_index_document()
+        doc = MethodIndexable('not the same document')
+        DOCID = 2
+        self.index.index_object(DOCID, doc)
+        self.assert_(self.index._docweight[DOCID])
+        self.assertEqual(len(self.index._wordinfo), 8)
+        self.assertEqual(len(self.index._docwords), 2)
+        self.assertEqual(len(self.index._docwords[DOCID]), 4)
+        document_wid = self.lexicon._words["document"]
+        for wid, (docfreq, map) in self.index._wordinfo.items():
+            if wid == document_wid:
+                self.assertEqual(docfreq, 2)
+                self.assertEqual(len(map), 2)
+                self.assert_(map.has_key(1))
+                self.assert_(map.has_key(DOCID))
+            else:
+                self.assertEqual(docfreq, 1)
+                self.assertEqual(len(map), 1)
+
+    def test_index_two_unindex_one(self):
+        # index two documents, unindex one, and test the results
+        self.test_index_two_documents()
+        self.index.unindex_object(1)
+        DOCID = 2
+        self.assertEqual(len(self.index._docweight), 1)
+        self.assert_(self.index._docweight[DOCID])
+        self.assertEqual(len(self.index._wordinfo), 4)
+        self.assertEqual(len(self.index._docwords), 1)
+        self.assertEqual(len(self.index._docwords[DOCID]), 4)
+        for docfreq, map in self.index._wordinfo.values():
+            self.assertEqual(docfreq, 1)
+            self.assertEqual(len(map), 1)
+            self.assert_(map.has_key(DOCID))
+
+    def test_index_duplicated_words(self, DOCID=1):
+        doc = Indexable("this is a repititive repititive repititive document")
+        self.index.index_object(DOCID, doc)
+        self.assert_(self.index._docweight[DOCID])
+        self.assertEqual(len(self.index._wordinfo), 5)
+        self.assertEqual(len(self.index._docwords), 1)
+        self.assertEqual(len(self.index._docwords[DOCID]), 5)
+        repititive_wid = self.lexicon._words["repititive"]
+        for wid, (docfreq, map) in self.index._wordinfo.items():
+            if wid == repititive_wid:
+                self.assertEqual(docfreq, 1)
+            else:
+                self.assertEqual(docfreq, 1)
+            self.assertEqual(len(map), 1)
+            self.assert_(map.has_key(DOCID))
 
 
 def test_suite():




From guido@python.org  Tue Apr 30 21:54:48 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 16:54:48 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - IQueryParser.py:1.1.2.2 QueryParser.py:1.1.2.3
Message-ID: <200204302054.g3UKsmC26010@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv26001

Modified Files:
      Tag: TextIndexDS9-branch
	IQueryParser.py QueryParser.py 
Log Message:
Fix license message.

=== Products/ZCTextIndex/IQueryParser.py 1.1.2.1 => 1.1.2.2 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 


=== Products/ZCTextIndex/QueryParser.py 1.1.2.2 => 1.1.2.3 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 




From guido@python.org  Tue Apr 30 22:04:19 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 17:04:19 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - IIndex.py:1.1.2.1
Message-ID: <200204302104.g3UL4J428493@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv28485

Added Files:
      Tag: TextIndexDS9-branch
	IIndex.py 
Log Message:
IIndex -- interface for an index object.


=== Added File Products/ZCTextIndex/IIndex.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################

"""Index Interface."""

import Interface

def IIndex(Interface.Base):
    """Interface for an Index."""

    def search(term):
        """Execute a search on a single term given as a string.

        Return an IIBucket.
        """




From barry@wooz.org  Tue Apr 30 22:35:38 2002
From: barry@wooz.org (Barry Warsaw)
Date: Tue, 30 Apr 2002 17:35:38 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - ILexicon.py:1.1.2.1
Message-ID: <200204302135.g3ULZcG12101@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv12092

Added Files:
      Tag: TextIndexDS9-branch
	ILexicon.py 
Log Message:
The ILexicon interface.


=== Added File Products/ZCTextIndex/ILexicon.py ===
##############################################################################
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
# 
##############################################################################
"""

Revision information:
$Id: ILexicon.py,v 1.1.2.1 2002/04/30 21:35:38 bwarsaw Exp $
"""

from Interface import Base as Interface

class ILexicon(Interface):
    """Object responsible for converting text to word identifiers."""

    def termToWordIds(text):
        """Return a sequence of ids of the words parsed from the text.

        Parses the text as if they are search terms, and skips words that
        aren't in the lexicon.
        """

    def sourceToWordIds(text):
        """Return a sequence of ids of the words parsed from the text.

        Parses the text as if they come from a source document, and creates
        new word ids for words that aren't (yet) in the lexicon.
        """




From fdrake@acm.org  Tue Apr 30 22:43:24 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 17:43:24 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - Index.py:1.1.2.2
Message-ID: <200204302143.g3ULhOs15736@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv15726

Modified Files:
      Tag: TextIndexDS9-branch
	Index.py 
Log Message:
Rename "doc-frequency" for a word to "word-frequency", with many local
variable renames.

Update calls to the lexicon to use the final interface for the
lexicon.

Implement the search() method.


=== Products/ZCTextIndex/Index.py 1.1.2.1 => 1.1.2.2 ===
 
 from BTrees.IOBTree import IOBTree
-from BTrees.IIBTree import IIBTree, IISet
+from BTrees.IIBTree import IIBTree, IIBucket, IISet
 
 
 class Index:
@@ -30,7 +30,7 @@
         self._lexicon = lexicon
         self._fieldname = fieldname
 
-        # wid -> ( doc-frequency, { docid -> frequency } )
+        # wid -> ( word-frequency, { docid -> frequency } )
         self._wordinfo = IOBTree()
 
         # docid -> W
@@ -41,7 +41,7 @@
         self._docwords = IOBTree()
 
     def index_object(self, docid, obj, threshold=None):
-        wids = self._lexicon.textToWordIDs(self._get_object_text(obj))
+        wids = self._lexicon.sourceToWordIds(self._get_object_text(obj))
         freqs, docweight = self._get_frequencies(wids)
         uniqwids = []
         for wid, f in freqs:
@@ -57,6 +57,20 @@
         del self._docwords[docid]
         del self._docweight[docid]
 
+    def search(self, term):
+        # XXX this can generate word IDs that are not in the index --
+        # potential denial of service
+        wids = self._lexicon.termToWordIds(term)
+        result = IIBucket()
+        N = len(self._docweight)
+        for wid in wids:
+            wordfreq, map = self._wordinfo[wid]
+            ft = len(map)
+            for docid, f in map.items():
+                w = f * invfreq(N, ft) / self._docweight[docid]
+                result[docid] = result.get(docid, 0) + w
+        return result
+
     def _get_object_text(self, obj):
         x = getattr(obj, self._fieldname)
         if callable(x):
@@ -78,21 +92,24 @@
 
     def _add_wordinfo(self, wid, f, docid):
         try:
-            olddocfreq, map = self._wordinfo[wid]
+            oldwordfreq, map = self._wordinfo[wid]
         except KeyError:
-            olddocfreq = 0
+            oldwordfreq = 0
             map = IIBTree()
         map[docid] = f
-        self._wordinfo[wid] = olddocfreq + 1, map
+        self._wordinfo[wid] = oldwordfreq + 1, map
 
     def _del_wordinfo(self, wid, docid):
-        olddocfreq, map = self._wordinfo[wid]
-        if olddocfreq == 1:
+        oldwordfreq, map = self._wordinfo[wid]
+        if oldwordfreq == 1:
             del self._wordinfo[wid]
             return
         del map[docid]
-        self._wordinfo[wid] = olddocfreq - 1, map
+        self._wordinfo[wid] = oldwordfreq - 1, map
 
 
 def frequency(count):
     return count
+
+def invfreq(N, ft):
+    return 1 + (N / ft)




From fdrake@acm.org  Tue Apr 30 22:44:53 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 17:44:53 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - test_index.py:1.1.2.4
Message-ID: <200204302144.g3ULir416168@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv16160/tests

Modified Files:
      Tag: TextIndexDS9-branch
	test_index.py 
Log Message:
Update SimpleLexicon to use the final ILexicon interface.
Add a trivial test case for the search() method.


=== Products/ZCTextIndex/tests/test_index.py 1.1.2.3 => 1.1.2.4 ===
         self._words = {}
 
-    def textToWordIDs(self, text):
+    def sourceToWordIds(self, text):
         words = text.split()
         wids = []
         for word in words:
@@ -32,6 +32,9 @@
             wids.append(wid)
         return wids
 
+    def termToWordIds(self, text):
+        return self.sourceToWordIds(text)
+
 
 class Indexable:
     def __init__(self, text):
@@ -120,6 +123,13 @@
                 self.assertEqual(docfreq, 1)
             self.assertEqual(len(map), 1)
             self.assert_(map.has_key(DOCID))
+
+    def test_simple_query(self):
+        doc = MethodIndexable('not the same document')
+        self.index.index_object(1, doc)
+        results = self.index.search("document")
+        self.assertEqual(len(results), 1)
+        self.assert_(results.has_key(1))
 
 
 def test_suite():




From guido@python.org  Tue Apr 30 22:54:03 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 17:54:03 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - QueryParser.py:1.1.2.4
Message-ID: <200204302154.g3ULs3Y20358@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv20336

Modified Files:
      Tag: TextIndexDS9-branch
	QueryParser.py 
Log Message:
Add a __repr__ method to the ParseTreeNode class.


=== Products/ZCTextIndex/QueryParser.py 1.1.2.3 => 1.1.2.4 ===
         return self._value
 
+    def __repr__(self):
+        return "%s(%r)" % (self.__class__.__name__, self.getValue())
+
 class NotNode(ParseTreeNode):
 
     _nodeType = "NOT"




From guido@python.org  Tue Apr 30 22:54:24 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 17:54:24 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - IQueryEngine.py:1.1.2.1 QueryEngine.py:1.1.2.1
Message-ID: <200204302154.g3ULsOV20441@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv20421

Added Files:
      Tag: TextIndexDS9-branch
	IQueryEngine.py QueryEngine.py 
Log Message:
Add a query engine.

=== Added File Products/ZCTextIndex/IQueryEngine.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################

"""Query Engine Interface."""

import Interface

class IQueryEngine(Interface.Base):
    """Interface for a Query Engine."""

    def executeQuery(index, tree):
        """Execute a query represented by a parse tree on an index.

        The index should implement IIndex.IIndex.  The parse tree
        should implement IQueryParse.IQueryParseTree.

        Return an IIBucket.
        """


=== Added File Products/ZCTextIndex/QueryEngine.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################

"""Query Engine."""

from BTrees.IIBTree import difference, weightedIntersection, weightedUnion

class QueryError(Exception):
    pass

class QueryEngine:

    def __init__(self):
        pass # No state

    def executeQuery(self, index, tree):
        kind = tree.nodeType()
        if kind == "AND":
            L = []
            for subtree in tree.getValue():
                if len(L) == 0:
                    set = self.executeQuery(index, subtree)
                else:
                    set = self._executeNotQuery(index, subtree)
                L.append((len(set), set))
            L.sort()
            set = L[0][1]
            for i in range(1, len(L)):
                Li1 = L[i][1]
                if isinstance(Li1, type(())):
                    assert Li1[0] == "NOT"
                    set = difference(set, Li1[1])
                else:
                    dummy, set = weightedIntersection(set, Li1)
            return set
        if kind == "OR":
            L = []
            for subtree in tree.getValue():
                set = self.executeQuery(index, subtree)
                L.append((len(set), set))
            L.sort()
            set = L[0][1]
            for i in range(1, len(L)):
                dummy, set = weightedUnion(set, L[i][1])
            return set
        if kind == "ATOM":
            return index.search(tree.getValue())
        if kind == "NOT":
            raise QueryError, "NOT operator must occur right after AND"

    def _executeNotQuery(self, index, tree):
        if tree.nodeType() == "NOT":
            return ("NOT", self.executeQuery(index, tree.getValue()))
        else:
            return self.executeQuery(index, tree)




From guido@python.org  Tue Apr 30 22:54:24 2002
From: guido@python.org (Guido van Rossum)
Date: Tue, 30 Apr 2002 17:54:24 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - testQueryEngine.py:1.1.2.1
Message-ID: <200204302154.g3ULsOp20445@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv20421/tests

Added Files:
      Tag: TextIndexDS9-branch
	testQueryEngine.py 
Log Message:
Add a query engine.

=== Added File Products/ZCTextIndex/tests/testQueryEngine.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################

from unittest import TestCase, TestSuite, main, makeSuite

from BTrees.IIBTree import IIBucket

from Products.ZCTextIndex.QueryParser import QueryParser, ParseError
from Products.ZCTextIndex.QueryEngine import QueryEngine, QueryError

class FauxIndex:

    def search(self, term):
        if term == "foo":
            b = IIBucket()
            b[1] = 1
            b[3] = 1
            return b
        if term == "bar":
            b = IIBucket()
            b[1] = 1
            b[2] = 1
            return b
        return IIBucket() # an empty one

class TestQueryEngine(TestCase):

    def setUp(self):
        self.parser = QueryParser()
        self.engine = QueryEngine()
        self.index = FauxIndex()

    def compareSet(self, set, dict):
        self.assertEqual(len(set), len(dict))
        for k, v in dict.items():
            self.assertEqual(set[k], v)

    def compareQuery(self, query, dict):
        tree = self.parser.parseQuery(query)
        set = self.engine.executeQuery(self.index, tree)
        self.compareSet(set, dict)

    def testExecuteQuery(self):
        self.compareQuery("foo AND bar", {1: 2})
        self.compareQuery("foo OR bar", {1: 2, 2: 1, 3:1})
        self.compareQuery("foo AND NOT bar", {3: 1})
        self.compareQuery("foo AND foo AND foo", {1: 3, 3: 3})
        self.compareQuery("foo OR foo OR foo", {1: 3, 3: 3})

    def testInvalidQuery(self):
        tree = self.parser.parseQuery("NOT foo")
        self.assertRaises(QueryError,
                          self.engine.executeQuery, self.index, tree)

def test_suite():
    return makeSuite(TestQueryEngine)

if __name__=='__main__':
    main(defaultTest='test_suite')




From fdrake@acm.org  Tue Apr 30 23:03:25 2002
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 30 Apr 2002 18:03:25 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex/tests - test_index.py:1.1.2.5
Message-ID: <200204302203.g3UM3P024669@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv24661/lib/python/Products/ZCTextIndex/tests

Modified Files:
      Tag: TextIndexDS9-branch
	test_index.py 
Log Message:
Add more tests of searching.
Make the SimpleLexicon not generate word IDs for unknown query terms.


=== Products/ZCTextIndex/tests/test_index.py 1.1.2.4 => 1.1.2.5 ===
 
     def termToWordIds(self, text):
-        return self.sourceToWordIds(text)
+        words = text.split()
+        wids = []
+        for word in words:
+            wid = self._words.get(word)
+            if wid is None:
+                continue
+            wids.append(wid)
+        return wids
 
 
 class Indexable:
@@ -124,13 +131,25 @@
             self.assertEqual(len(map), 1)
             self.assert_(map.has_key(DOCID))
 
-    def test_simple_query(self):
-        doc = MethodIndexable('not the same document')
-        self.index.index_object(1, doc)
+    def test_simple_query_oneresult(self):
+        self.index.index_object(1, MethodIndexable('not the same document'))
         results = self.index.search("document")
         self.assertEqual(len(results), 1)
         self.assert_(results.has_key(1))
 
+    def test_simple_query_noresults(self):
+        self.index.index_object(1, MethodIndexable('not the same document'))
+        results = self.index.search("frobnicate")
+        self.assertEqual(len(results), 0)
+
+    def test_query_oneresult(self):
+        self.index.index_object(1, Indexable(
+            'not the same document'))
+        self.index.index_object(2, MethodIndexable(
+            'something about something else'))
+        results = self.index.search("document")
+        self.assertEqual(len(results), 1)
+        self.assert_(results.has_key(1))
 
 def test_suite():
     return makeSuite(IndexTest)




From jeremy@zope.com  Tue Apr 30 23:27:26 2002
From: jeremy@zope.com (Jeremy Hylton)
Date: Tue, 30 Apr 2002 18:27:26 -0400
Subject: [Zope-CVS] CVS: Products/ZCTextIndex - IIndex.py:1.1.2.2
Message-ID: <200204302227.g3UMRQX02735@cvs.baymountain.com>

Update of /cvs-repository/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv2727

Modified Files:
      Tag: TextIndexDS9-branch
	IIndex.py 
Log Message:
Define query_weight().


=== Products/ZCTextIndex/IIndex.py 1.1.2.1 => 1.1.2.2 ===
         Return an IIBucket.
         """
+
+    def query_weight(terms):
+        """Return the weight for a set of query terms.
+
+        'terms' is a sequence of all terms included in the query,
+        although not terms with a not.  If a term appears more than
+        once in a query, it should appear more than once in terms.
+        """
+