Changeset 1987:1667a5143bec

Timestamp:

11/30/06 07:22:55 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Children:

1988:ddf9c7f711c3, 2008:60f08a540628

Message:

Turned on edit mode (work of Stein, Alex C., Dorian, and Tom B.)

Location:

sage/server/notebook

Files:

• cell.py (modified) (5 diffs)
• css.py (modified) (3 diffs)
• notebook.py (modified) (2 diffs)
• server.py (modified) (6 diffs)
• worksheet.py (modified) (3 diffs)

sage/server/notebook/cell.py

@@ -112 +112 @@
                         s += pr + v + '\n'
         else:
-            s += self.__in.strip() + '\n///\n'
+            s += self.__in.strip() 
 
         if prompts:
@@ -127 +127 @@
                 out = self.output_text(ncols, html=False)
         else:
-            out = self.output_text(ncols, html=False).split('\n')
-            if len(out) > 0:
-                if wiki_out:
-                  out = '///\n' + '\n'.join(out)
-                else:
-                  out = '#out: ' + '\n'.join(out)
-            else:
-                out = ''
             out = self.output_text(ncols, html=False)
+            if wiki_out and len(out) > 0:
+                out = '///\n' + out
 
         if not max_out is None and len(out) > max_out:
@@ -149 +143 @@
         return s
     
-    def wiki_text(self, ncols=0, prompts=False, max_out=None):
+    def edit_text(self, ncols=0, prompts=False, max_out=None):
         s = self.plain_text(ncols,prompts,max_out,wiki_out=True)
-        #return '{{{#!sage[%s]\n'%self.id() + s + '\n}}}'
-        #return '{{{[%s]\n'%self.id() + s + '\n}}}'
         return '{{{\n%s\n}}}'%s
 
@@ -284 +276 @@
                 s = s[j+7:]
             s = t
-            if not self.is_html() and len(s.strip()) > 0:
-                s = '<pre class="shrunk">' + s.strip('\n') + '</pre>'
-
             # if there is an error in the output,
             # specially format it.
             s = format_exception(s, ncols)
+            if not self.is_html() and len(s.strip()) > 0:
+                s = '<pre class="shrunk">' + s.strip('\n') + '</pre>'
+
 
         return s.strip('\n')
@@ -500 +492 @@
 
 def format_exception(s, ncols):
-    if not ('Traceback (most recent call last):' in s):
+    m = 'Traceback (most recent call last):'
+    s = s.lstrip()
+    if s[:len(m)] != m:
         return s
     if ncols > 0:

sage/server/notebook/css.py

@@ -1047 +1047 @@
   margin:0px;
   padding-left:0px;  
-  color:#0000cc;
+  color:#0000aa;
 }
 
@@ -1054 +1054 @@
   margin:0px;
   padding:0px;  
-  color:#0000cc;
+  color:#0000aa;
 }
 span.cell_output_nowrap {
@@ -1071 +1071 @@
   margin:0px;
   padding:0px;
-  color:#0000cc;
+  color:#0000aa;
 }
 span.cell_output_nowrap_hidden {

sage/server/notebook/notebook.py

@@ -835 +835 @@
         #body += '    <a class="plain_text" onClick="worksheet_text_window(\'%s\')">Text</a>'%worksheet.filename() + vbar
         body += '    <a class="doctest_text" onClick="doctest_window(\'%s\')">Text</a>'%worksheet.filename() + vbar
-        body += '    <a class="plain_text" href="%s__edit__.html">Edit</a>'%worksheet.filename() + vbar
+        body += '    <a class="plain_text" href="%s?edit">Edit</a>'%worksheet.filename() + vbar
         #body += '    <a class="plain_text" onClick="show_wiki_window(\'%s\')">Wiki-form</a>'%worksheet.filename() + vbar
         body += '    <a class="doctest_text" onClick="print_window(\'%s\')">Print</a>'%worksheet.filename() + vbar
@@ -935 +935 @@
         body_html = ''
         body_html += '<h1 class="edit">SAGE Notebook: Editing Worksheet "%s"</h1>\n'%worksheet.name()
-        body_html += '<form method="post" action="/%s/edit" enctype="multipart/form-data">\n'%worksheet.name()
+        body_html += "<b>Warnings:</b> You cannot undo after you save changes (yet).  All graphics will be deleted when you save -- preserving images not yet implemented.  No markup not in {{{}}}'s is preserved.<br><br>"
+        body_html += '<form method="post" action="%s?edit" enctype="multipart/form-data">\n'%worksheet.filename()
         body_html += '<input type="submit" value="Save Changes" name="button_save"/>\n'
-        body_html += '<input type="submit" value="Preview" name="button_preview"/>\n'
+        #body_html += '<input type="submit" value="Preview" name="button_preview"/>\n'
         body_html += '<input type="submit" value="Cancel" name="button_cancel"/>\n'
         body_html += '<textarea class="edit" id="cell_intext" rows="30" name="textfield">'+t+'</textarea>'

sage/server/notebook/server.py

@@ -459 +459 @@
     def edit_save(self, filename, newtext):
         W = notebook.get_worksheet_with_filename(filename)
+        W.edit_save(newtext)
+        return self.show_page(worksheet_id=W.id())
+
+    def edit_preview(self):
         raise NotImplementedError
-
-    def edit_preview(self):
-        print "edit_preview"        
     
-    def edit_cancel(self):
-        print "edit_ancel"                
-
+    def edit_cancel(self, filename):
+        W = notebook.get_worksheet_with_filename(filename)
+        return self.show_page(worksheet_id=W.id())
 
 
@@ -534 +535 @@
         self.wfile.write(notebook.upload_window())
 
-    def insert_wiki_cells(self):
-        C = self.get_postvars()
-        W = notebook.get_worksheet_with_id(int(C['worksheet_id'][0]))
-        W.insert_wiki_cells(C['text'][0])
-        response = C['eval'][0] + SEP
-        response+= "%r"%W.cell_id_list() + SEP
-        response+= SEP.join([c.html(div_wrap=False) for c in W[:-1]])
-        self.wfile.write(response) 
+##     def insert_wiki_cells(self):
+##         C = self.get_postvars()
+##         W = notebook.get_worksheet_with_id(int(C['worksheet_id'][0]))
+##         W.insert_wiki_cells(C['text'][0])
+##         response = C['eval'][0] + SEP
+##         response+= "%r"%W.cell_id_list() + SEP
+##         response+= SEP.join([c.html(div_wrap=False) for c in W[:-1]])
+##         self.wfile.write(response) 
 
     def download_worksheet(self, filename):
@@ -590 +591 @@
             elif worksheet_filename == '__license__':
                 self.license_window()
-            elif worksheet_filename[-8:] == '__edit__':
-                self.edit_text(worksheet_filename[:-8],prompts=False)
             elif worksheet_filename[-7:] == '__doc__':
                 self.plain_text_worksheet(worksheet_filename[:-7], prompts=True)
@@ -603 +602 @@
                 self.html_worksheet(worksheet_filename, do_print=False)
             return
-        
+
         elif path[-4:] == '.sws':
             
@@ -703 +702 @@
         i = self.path.rfind('?')
         if i != -1:
-            if 'debug' in self.path[i:]:
+            if self.path[i+1:i+6] == 'debug':
                 show_debug = True
+            elif self.path[i+1:i+5] == 'edit':
+                j = self.path.rfind('/')
+                worksheet_filename = self.path[j+1:i]
+                self.edit_text(worksheet_filename,prompts=False)
+                return
             self.path = self.path[:i]
 
         #verbose(self.path)
-
         if self.path[-4:] in ['.eps', '.pdf', '.png', '.bmp', '.svg', '.tex', \
                               '.dvi', '.log', '.css',\
@@ -785 +788 @@
             M = cgi.parse_multipart(self.rfile, post_dict);
 
-            if self.path[-5:] == '/edit' and self.path != '/edit':
-                # i.e., this "/edit" after a longer name, not a worksheet named /edit
-                filename = self.path[:-5].strip('/')
+            if self.path[-5:] == '?edit' and self.path != '?edit':
+                filename = self.path[1:-5]
                 if M.has_key('button_save'):
                     self.edit_save(filename, M['textfield'][0])
+                elif M.has_key('button_cancel'):
+                    self.edit_cancel(filename)
                 return
             

sage/server/notebook/worksheet.py

@@ -162 +162 @@
         suitable for hand editing.
         """
-        s = '#'*80 + '\n'
-        s += '# Wiki form for worksheet: %s'%self.name() + '\n'
-        s += '#'*80+'\n\n'
+        #s = '#'*80 + '\n'
+        #s += '# Worksheet: %s'%self.name() + '\n'
+        #s += '#'*80+'\n\n'
+        s = ' == %s =='%self.name() + '\n\n'
         for C in self.__cells:
-            t = C.wiki_text(prompts=prompts).strip()
+            t = C.edit_text(prompts=prompts).strip()
             if t != '':
                 s += '\n\n' + t
         return s
 
-    def insert_wiki_cells(self,text):
+    def edit_save(self,text):
         text.replace('\r\n','\n')
-        lines = text.split('\n')
-        input = ""
-        output = ""
-        in_cell = False
-        in_output = False
-        old_first = self.__cells[0].id()
-        for line in lines:
-            if not in_cell: 
-                if line[:3] == '{{{':
-                    in_cell = True
-            elif line != '}}}':
-                if not in_output:
-                    if line == '///':
-                        in_output = True
-                    else:
-                        input += line+'\n'
-                else:
-                    output += line+'\n'
-            else:
-                C = self.new_cell_before(old_first)
-                C.set_input_text(input)
-                C.set_output_text(output,output)
-                C.set_cell_output_type()
-                input = ""
-                output = ""
-                in_cell = False
-                in_output = False
+        # This is where we would save the last version in a history.
+        cells = []
+        while True:
+            try:
+                input, output, graphics, i = extract_first_text_cell(text)
+            except EOFError:
+                break
+            text = text[i:]
+            C = self._new_cell()
+            C.set_input_text(input)
+            C.set_output_text(output, '')
+            cells.append(C)
+        self.__cells = cells
+            
+##         lines = text.split('\n')
+##         input = ""
+##         output = ""
+##         in_cell = False
+##         in_output = False
+##         old_first = self.__cells[0].id()
+##         for line in lines:
+##             if not in_cell: 
+##                 if line[:3] == '{{{':
+##                     in_cell = True
+##             elif line != '}}}':
+##                 if not in_output:
+##                     if line == '///':
+##                         in_output = True
+##                     else:
+##                         input += line+'\n'
+##                 else:
+##                     output += line+'\n'
+##             else:
+##                 C = self.new_cell_before(old_first)
+##                 C.set_input_text(input)
+##                 C.set_output_text(output,output)
+##                 C.set_cell_output_type()
+##                 input = ""
+##                 output = ""
+##                 in_cell = False
+##                 in_output = False
 
     def input_text(self):
@@ -369 +384 @@
 
     def _new_cell(self, id=None):
-        D = self.__notebook.defaults()
         if id is None:
             id = self.__next_id
@@ -1229 +1243 @@
     return s
             
+
+
+def extract_first_text_cell(text):
+    """
+    INPUT:
+        a block of wiki-like marked up text
+    OUTPUT:
+        input -- string, the input text
+        output -- string, the output text
+        graphics -- string, text that describes any embedded graphics
+        end -- integer, first position after }}} in text.
+    """
+    # Find the input block
+    i = text.find('{{{')
+    if i == -1:
+        raise EOFError
+    j = text.find('}}}')
+    if j <= i:
+        j = len(text)
+    k = text.find('///')
+    if k == -1 or k > j:
+        input = text[i+3:j]
+        output = ''
+        graphics = ''
+    else:
+        input = text[i+3:k].strip()
+        # Find the graphics block, if there is one.
+        l = text[k+3:].find('///')
+        if l != -1 and l+k+3 < j:
+            graphics = text[l+k+3+3:j]
+        else:
+            graphics = ''
+            l = j
+        output = text[k+3:l].strip()
+    return input, output, graphics, j+3
+