Merge branch 'master' of stigma:platforma

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 76d0456..889fda5 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -61,7 +61,7 @@ def file_list(request, repo):
 
     fl = []
     for file in repo.repo[latest_default]:
 
     fl = []
     for file in repo.repo[latest_default]:

-        m = re.match(u'^pub_([\\w\\$\\.0-9_-]+).xml$', file.decode('utf-8'), re.UNICODE)
+        m = re.match(u'^pub_([^/]+).xml$', file.decode('utf-8'), re.UNICODE)

         if m is not None:
             fl.append(m.group(1))
             
         if m is not None:
             fl.append(m.group(1))
             


@@ -307,7 +307,7 @@ def file_commit(request, path, repo):
 @with_repo
 def file_dc(request, path, repo):
     errors = None
 @with_repo
 def file_dc(request, path, repo):
     errors = None

-    rpath = file_path(fileid)
+    rpath = file_path(path)

 
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)
 
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)


@@ -476,11 +476,12 @@ def split_text(request, path):
         print "validating sform"
         if sform.is_valid():
             valid = True
         print "validating sform"
         if sform.is_valid():
             valid = True

-            if sform.cleaned_data['autoxml']:
-                print "validating dcform"                
-                valid = dcform.is_valid()        
+#            if sform.cleaned_data['autoxml']:
+#                print "validating dcform"
+#                valid = dcform.is_valid()

 
         print "valid is ", valid
 
         print "valid is ", valid

+

         if valid:
             uri = path + '$' + sform.cleaned_data['partname']
             child_rpath = file_path(uri)
         if valid:
             uri = path + '$' + sform.cleaned_data['partname']
             child_rpath = file_path(uri)


@@ -496,7 +497,7 @@ def split_text(request, path):
                                         
                 fulltext = sform.cleaned_data['fulltext']               
                 fulltext = fulltext.replace(u'<include-tag-placeholder />',
                                         
                 fulltext = sform.cleaned_data['fulltext']               
                 fulltext = fulltext.replace(u'<include-tag-placeholder />',

-                    librarian.xinclude_forURI('wlrepo://'+uri) )               
+                    librarian.xinclude_forURI(u'wlrepo://'+uri) )

 
                 repo._write_file(rpath, fulltext.encode('utf-8'))
 
 
                 repo._write_file(rpath, fulltext.encode('utf-8'))
 


@@ -504,7 +505,7 @@ def split_text(request, path):
                 if sform.cleaned_data['autoxml']:
                     # this is a horrible hack - really
                     bi = dcparser.BookInfo.from_element(librarian.DEFAULT_BOOKINFO.to_etree())
                 if sform.cleaned_data['autoxml']:
                     # this is a horrible hack - really
                     bi = dcparser.BookInfo.from_element(librarian.DEFAULT_BOOKINFO.to_etree())

-                    bi.update(dcform.cleaned_data)
+                    bi.update(dcform.data)

 
                     newtext = librarian.wrap_text(newtext, \
                         unicode(date.today()), bookinfo=bi )
 
                     newtext = librarian.wrap_text(newtext, \
                         unicode(date.today()), bookinfo=bi )


@@ -516,8 +517,10 @@ def split_text(request, path):
 
             if repo.in_branch(split_action, file_branch(path, request.user)):
                 # redirect to success
 
             if repo.in_branch(split_action, file_branch(path, request.user)):
                 # redirect to success

+                import urllib
+                uri = urllib.quote( unicode(uri).encode('utf-8'))

                 return HttpResponseRedirect( reverse('split-success',\
                 return HttpResponseRedirect( reverse('split-success',\

-                    kwargs={'path': path})+'?child='+uri)
+                    kwargs={'path': path})+'?child='+uri )

     else:
         try: # to read the current DC
             repo = hg.Repository(settings.REPOSITORY_PATH)
     else:
         try: # to read the current DC
             repo = hg.Repository(settings.REPOSITORY_PATH)