Changeset 8013

Timestamp:

Aug 13, 2021, 8:17:14 AM (9 months ago)

Author:

Nicklas Nordborg

Message:

Merge pre-BASE 3.19 changes to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• credits.txt (modified) (1 diff)
• src/core/net/sf/basedb/core/PropertyFilter.java (modified) (1 diff)
• www/common/annotations/batch_inherit.js (modified) (1 diff)
• www/common/plugin/test_with_file.js (modified) (1 diff)
• www/filemanager/upload/drag_drop_upload.js (modified) (8 diffs)
• www/filemanager/upload/drag_drop_upload.jsp (modified) (4 diffs)
• www/my_base/index.jsp (modified) (1 diff)

trunk/credits.txt

@@ -1 +1 @@
 $Id$
 
-The current BASE team is (at BASE 3.18 release)
+The current BASE team is (at BASE 3.19 release)
 {{{
 Jari Häkkinen

trunk/src/core/net/sf/basedb/core/PropertyFilter.java

@@ -1262 +1262 @@
       else
       {
-        parameter = value == null ? null : Expressions.parameter(parameterName, getValueAsObject(unit, true));
+        parameter = value == null ? null : Expressions.parameter(parameterName, getValueAsObject(unit, true), getValueType());
       }
     }

trunk/www/common/annotations/batch_inherit.js

@@ -96 +96 @@
     
     var tr = document.createElement('tr');
-    tr.className = 'highlight ' + (selectedAnnotationTypes.length % 2 == 0 ? 'bg-evenrow' : 'bg-oddrow');
+    tr.className = 'row highlight ' + (selectedAnnotationTypes.length % 2 == 0 ? 'bg-evenrow' : 'bg-oddrow');
     tr.id = 'at-'+item.id;
 

trunk/www/common/plugin/test_with_file.js

@@ -120 +120 @@
     
     var response = JSON.parse(request.responseText);
-    var excelMode = response.excelMode;
+    var excelMode = response.excelMode || false;
 
     frm.filemode.value = excelMode ? 'excel' : 'csv';

trunk/www/filemanager/upload/drag_drop_upload.js

@@ -27 +27 @@
 {
   var upload = {};
+  var zipFormats = [];
   
   var filesAndFolders;
@@ -50 +51 @@
   upload.initPage = function()
   {
+    zipFormats = Data.json('page-data', 'zip-formats');
+
     Buttons.addClickHandler('btnUpload', upload.beginFileUpload);
     Buttons.addClickHandler('close', App.closeWindow);
@@ -57 +60 @@
     filesAndFolders = window.opener.FileManager.getFilesToUpload();
     upload.processFilesAndFolders();
+  }
+  
+  /**
+    Get the ID of the best matching compressed format
+  */
+  upload.getCompressedFormat = function(filename)
+  {
+    var longestMatch = 0;
+    var bestFormat = null;
+    
+    for (var formatNo = 0; formatNo < zipFormats.length; formatNo++)
+    {
+      var zf = zipFormats[formatNo];
+      for (var extNo = 0; extNo < zf.extensions.length; extNo++)
+      {
+        var ext = '.' + zf.extensions[extNo];
+        var index = filename.lastIndexOf(ext);
+        if (index > 0 && (index + ext.length == filename.length))
+        {
+          if (ext.length > longestMatch)
+          {
+            longestMatch = ext.length;
+            bestFormat = zf;
+          }
+        }
+      }
+    }
+    return bestFormat;
   }
   
@@ -78 +109 @@
     var ff = filesAndFolders.splice(0, 1)[0];
     currentFolder = ff.subfolder || '';
-    if (ff.isFile)
-    {
-      // Get the file item as a 'File' object (its an async operation)
-      ff.file(upload.gotFile);
-    }
-    else if (ff.isDirectory)
-    {
-      // Save the currentFolder for later use in 'upload.gotFolder'
-      currentFolder += ff.name+'/';
-      // Read files and subfolders (its an async operation)
-      currentDirectoryReader = ff.createReader();
-      currentDirectoryReader.readEntries(upload.gotFolder);
-    }
-    else
-    {
-      // Process next entry
-      upload.processFilesAndFolders();
-    }
+    // Ignore files/directories inside subfolders starting with '.' unless
+    // the top folder that was selected is also hidden
+    var ignore = ff.name.charAt(0)=='.' && (currentFolder.length > 0 && currentFolder.charAt(0)!='.');
+    if (!ignore)
+    {
+      if (ff.isFile)
+      {
+        // Get the file item as a 'File' object (its an async operation)
+        ff.file(upload.gotFile);
+        return;
+      }
+      else if (ff.isDirectory)
+      {
+        // Save the currentFolder for later use in 'upload.gotFolder'
+        currentFolder += ff.name+'/';
+        // Read files and subfolders (its an async operation)
+        currentDirectoryReader = ff.createReader();
+        currentDirectoryReader.readEntries(upload.gotFolder);
+        return;
+      }
+    }
+    
+    // Process next entry
+    upload.processFilesAndFolders();
   }
   
@@ -133 +170 @@
     {
       files.sort(upload.sortFilesByFolder);
-      var html = '<table class="filelist">';
+      var html = '<table class="filelist" style="width: 100%;">';
       var lastSubfolder = '';
       var pad = '<td colspan="2" class="name">';
       var numFolders = 1;
+      var numCompressedFiles = 0;
       for (var i = 0; i < files.length; i++)
       {
@@ -142 +180 @@
         totalBytesToUpload += f.size;
         totalFiles++;
+        if (upload.getCompressedFormat(f.name)) numCompressedFiles++;
         if (totalFiles <= 500)
         {
@@ -158 +197 @@
         html += '<tr><td colspan="3" class="morefiles">+'+(totalFiles-500)+' more files...</td></tr>';
       }
+      if (numCompressedFiles > 0) Doc.show('unpackSection');
       var numFilesMsg = totalFiles==1?'1 file' : totalFiles+' files';
       document.title = 'Uploading '+numFilesMsg+' to '+Data.get('page-data', 'directory-path');
@@ -270 +310 @@
     upl.set('autoSelect', totalFiles == 1 ? 1 : 0); // No automatic selection if we upload more than one file
     upl.set('replace_existing', overwrite);
+    if (frm.unpackCompressed.checked)
+    {
+      var zipFormat = upload.getCompressedFormat(file.name);
+      if (zipFormat)
+      {
+        upl.set('zip_format', zipFormat.id);
+        upl.set('zip_unpack', 1);
+        upl.set('zip_overwrite', overwrite);
+        upl.set('zip_keep', 0);
+      }
+    }
     upl.set('description', frm.description.value);
     upl.set('the_file', file);

trunk/www/filemanager/upload/drag_drop_upload.jsp

@@ -75 +75 @@
   String numFilesText = numFiles == 1 ? "1 file" : numFiles+" files";
   final String title = HTML.encodeTags("Uploading "+numFilesText+" to " + dir.getName());
+  
+  JSONArray jsonZipFormats = new JSONArray();
+  // Query to retreive FileUnpacker plugins
+  final ItemQuery<PluginDefinition> pluginQuery = PluginDefinition.getQuery(null, "net.sf.basedb.util.zip.FileUnpacker");
+  pluginQuery.order(Orders.asc(Hql.property("name")));
+  pluginQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
+  List<PluginDefinition> plugins = pluginQuery.list(dc);
+  for (PluginDefinition plugin : plugins)
+  {
+    FileUnpacker unpacker = plugin.newInstance(FileUnpacker.class, sc, null, null);
+    JSONObject jsonZipFormat = new JSONObject();
+    jsonZipFormat.put("id", plugin.getId());
+    jsonZipFormat.put("name", unpacker.getFormatName());
+    JSONArray jsonExtensions = new JSONArray();
+    jsonExtensions.addAll(unpacker.getExtensions());
+    jsonZipFormat.put("extensions", jsonExtensions);
+    jsonZipFormats.add(jsonZipFormat);
+  }
   %>
   <base:page type="popup" title="<%=title%>">
@@ -121 +139 @@
     data-directory-id="<%=directoryId%>"
     data-directory-path="<%=HTML.encodeTags(dir.getPath().toString()) %>"
+    data-zip-formats="<%=HTML.encodeTags(jsonZipFormats.toJSONString()) %>"
   ></div>
 
@@ -128 +147 @@
     <div class="content">
       <table class="fullform input100 bottomborder">
-      <tr class="bottomborder" style="border-bottom-style: dotted;">
+      <tr>
         <th>Overwrite existing</th>
         <td>
@@ -137 +156 @@
         <td></td>
       </tr>
-      <tr class="big">
+      <tr id="unpackSection" style="display: none;">
+        <th class="subprompt"></th>
+        <td>
+          <label><input type="checkbox" name="unpackCompressed" id="unpackCompressed">Unpack compressed files</label>
+        </td>
+        <td></td>
+      </tr>
+      <tr class="big topborder" style="border-top-style: dotted;">
         <th>Files</th>
         <td colspan="2">

trunk/www/my_base/index.jsp

@@ -391 +391 @@
       {
         %>
+        <div style="margin: 0.25em;">
         Using quota from group: <%=Base.getLinkedName(ID, quotaGroup, false, true)%>
+        </div>
         <%
       }