{\r
"title": "NEXIO betöltő",\r
- "active": false,\r
+ "active": true,\r
"startInTray": false,\r
"enableCustomMetadataId": true,\r
"player": {\r
<None Include="Configuration\-configuration-sxs.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\-configuration-studio.json">\r
+ <None Include="Configuration\configuration-studio.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
</ItemGroup>\r
<None Include="Resources\ic_folder_open_black_24dp_1x.png" />\r
<None Include="Resources\ic_refresh_black_24dp_1x.jpg" />\r
<None Include="Resources\ic_refresh_black_24dp_1x.png" />\r
+ <None Include="Resources\ic_cached_black_18dp.png" />\r
<Content Include="Resources\play.ico" />\r
<Content Include="TODO.txt" />\r
</ItemGroup>\r
this.treeFolders = new MaestroShared.Controls.DoubleClickTreeView();\r
this.ilFolders = new System.Windows.Forms.ImageList(this.components);\r
this.pSourceFilter = new System.Windows.Forms.TableLayoutPanel();\r
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
this.txtSourceFilter = new System.Windows.Forms.TextBox();\r
- this.picClearFilter = new System.Windows.Forms.PictureBox();\r
+ this.picRefreshFileList = new System.Windows.Forms.PictureBox();\r
this.pSourceDisplay = new System.Windows.Forms.TableLayoutPanel();\r
this.tsSource = new System.Windows.Forms.ToolStrip();\r
this.btnShowFolders = new System.Windows.Forms.ToolStripButton();\r
((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit();\r
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
this.pSourceFilter.SuspendLayout();\r
- ((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).BeginInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.picRefreshFileList)).BeginInit();\r
this.pSourceDisplay.SuspendLayout();\r
this.tsSource.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.scOperations)).BeginInit();\r
// pSourceFilter\r
// \r
this.pSourceFilter.AutoSize = true;\r
- this.pSourceFilter.ColumnCount = 2;\r
+ this.pSourceFilter.ColumnCount = 3;\r
this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+ this.pSourceFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+ this.pSourceFilter.Controls.Add(this.pictureBox1, 0, 0);\r
this.pSourceFilter.Controls.Add(this.txtSourceFilter, 0, 0);\r
- this.pSourceFilter.Controls.Add(this.picClearFilter, 1, 0);\r
+ this.pSourceFilter.Controls.Add(this.picRefreshFileList, 2, 0);\r
this.pSourceFilter.Dock = System.Windows.Forms.DockStyle.Top;\r
this.pSourceFilter.Location = new System.Drawing.Point(10, 23);\r
this.pSourceFilter.Margin = new System.Windows.Forms.Padding(0);\r
this.pSourceFilter.Name = "pSourceFilter";\r
- this.pSourceFilter.Padding = new System.Windows.Forms.Padding(0, 0, 0, 4);\r
this.pSourceFilter.RowCount = 1;\r
this.pSourceFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
- this.pSourceFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
this.pSourceFilter.Size = new System.Drawing.Size(330, 24);\r
this.pSourceFilter.TabIndex = 17;\r
// \r
+ // pictureBox1\r
+ // \r
+ this.pictureBox1.BackColor = System.Drawing.Color.Transparent;\r
+ this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;\r
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));\r
+ this.pictureBox1.ImageLocation = "";\r
+ this.pictureBox1.Location = new System.Drawing.Point(284, 2);\r
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);\r
+ this.pictureBox1.Name = "pictureBox1";\r
+ this.pictureBox1.Size = new System.Drawing.Size(20, 20);\r
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
+ this.pictureBox1.TabIndex = 18;\r
+ this.pictureBox1.TabStop = false;\r
+ // \r
// txtSourceFilter\r
// \r
this.txtSourceFilter.Dock = System.Windows.Forms.DockStyle.Top;\r
- this.txtSourceFilter.Location = new System.Drawing.Point(0, 0);\r
- this.txtSourceFilter.Margin = new System.Windows.Forms.Padding(0);\r
+ this.txtSourceFilter.Location = new System.Drawing.Point(2, 2);\r
+ this.txtSourceFilter.Margin = new System.Windows.Forms.Padding(2);\r
this.txtSourceFilter.Name = "txtSourceFilter";\r
- this.txtSourceFilter.Size = new System.Drawing.Size(310, 20);\r
+ this.txtSourceFilter.Size = new System.Drawing.Size(278, 20);\r
this.txtSourceFilter.TabIndex = 16;\r
this.txtSourceFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSourceFilter_KeyDown);\r
// \r
- // picClearFilter\r
- // \r
- this.picClearFilter.BackColor = System.Drawing.Color.Transparent;\r
- this.picClearFilter.Cursor = System.Windows.Forms.Cursors.Hand;\r
- this.picClearFilter.Image = ((System.Drawing.Image)(resources.GetObject("picClearFilter.Image")));\r
- this.picClearFilter.ImageLocation = "";\r
- this.picClearFilter.Location = new System.Drawing.Point(310, 0);\r
- this.picClearFilter.Margin = new System.Windows.Forms.Padding(0);\r
- this.picClearFilter.Name = "picClearFilter";\r
- this.picClearFilter.Size = new System.Drawing.Size(20, 20);\r
- this.picClearFilter.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
- this.picClearFilter.TabIndex = 17;\r
- this.picClearFilter.TabStop = false;\r
- this.picClearFilter.Click += new System.EventHandler(this.picClearFilter_Click);\r
+ // picRefreshFileList\r
+ // \r
+ this.picRefreshFileList.BackColor = System.Drawing.Color.Transparent;\r
+ this.picRefreshFileList.Cursor = System.Windows.Forms.Cursors.Hand;\r
+ this.picRefreshFileList.Image = global::Maestro.Properties.Resources.ic_refresh_black_24dp_1x;\r
+ this.picRefreshFileList.ImageLocation = "";\r
+ this.picRefreshFileList.Location = new System.Drawing.Point(308, 2);\r
+ this.picRefreshFileList.Margin = new System.Windows.Forms.Padding(2);\r
+ this.picRefreshFileList.Name = "picRefreshFileList";\r
+ this.picRefreshFileList.Size = new System.Drawing.Size(20, 20);\r
+ this.picRefreshFileList.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;\r
+ this.picRefreshFileList.TabIndex = 17;\r
+ this.picRefreshFileList.TabStop = false;\r
+ this.picRefreshFileList.Click += new System.EventHandler(this.picRefreshFileList_Click);\r
// \r
// pSourceDisplay\r
// \r
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();\r
this.pSourceFilter.ResumeLayout(false);\r
this.pSourceFilter.PerformLayout();\r
- ((System.ComponentModel.ISupportInitialize)(this.picClearFilter)).EndInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.picRefreshFileList)).EndInit();\r
this.pSourceDisplay.ResumeLayout(false);\r
this.pSourceDisplay.PerformLayout();\r
this.tsSource.ResumeLayout(false);\r
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;\r
private System.Windows.Forms.TableLayoutPanel pSourceFilter;\r
private System.Windows.Forms.TextBox txtSourceFilter;\r
- private System.Windows.Forms.PictureBox picClearFilter;\r
+ private System.Windows.Forms.PictureBox picRefreshFileList;\r
private System.Windows.Forms.Button btnLookupMetadata;\r
private System.Windows.Forms.ToolStrip tsMetadata;\r
private System.Windows.Forms.ToolStripButton btnEditMetadata;\r
private DataGridViewTextBoxColumn columnKillDate;\r
private DataGridViewTextBoxColumn Message;\r
private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1;\r
+ private PictureBox pictureBox1;\r
}\r
}\r
\r
}\r
if (folders == null)\r
return;\r
+\r
+ Array.Sort(folders, StringComparer.InvariantCultureIgnoreCase);\r
treeFolders.BeginUpdate();\r
foreach (var folder in folders) {\r
TreeNode folderNode = parent.Nodes.Add(GetLastSegment(folder));\r
folderNode.Nodes.Add("..");\r
}\r
- treeFolders.Sort();\r
+ //treeFolders.Sort();\r
parent.EnsureVisible();\r
treeFolders.EndUpdate();\r
}\r
\r
private void OnBeforeExpandFolder(object sender, TreeViewCancelEventArgs e) {\r
- if (e.Node.Nodes.Count != 1 || !"..".Equals(e.Node.Nodes[0].Text))\r
+ logger.Info("<OnBeforeExpandFolder {0}", e.Node.Text);\r
+ if (e.Node.Nodes.Count != 1 || !"..".Equals(e.Node.Nodes[0].Text)) {\r
+ logger.Info("OnBeforeExpandFolder> Nothing to do");\r
return;\r
+ }\r
e.Node.Nodes.Clear();\r
Uri address = new Uri(Path.Combine(Configuration.Source.Local.Address.LocalPath, GetPath(e.Node)));\r
AddFolders(address, e.Node);\r
+ logger.Info("OnBeforeExpandFolder>");\r
}\r
\r
private void OnDoubleClickFolder(object sender, TreeNodeMouseClickEventArgs args) {\r
ResetSourceSearch();\r
}\r
\r
+ private void picRefreshFileList_Click(object sender, EventArgs e) {\r
+ ISource source = bindingSource.DataSource as ISource;\r
+ source.Reset();\r
+ }\r
+\r
private void ResetSourceSearch() {\r
txtSourceFilter.Text = null;\r
bindingSource.Filter = null;\r
if (e.Node != null)\r
e.Node.Expand();\r
}\r
+\r
+ //private void OnEditMetadata(object sender, EventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnDefineSegments(object sender, EventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnLookupByMetadata(object sender, EventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnMetadataIDChanged(object sender, EventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnSelectedMetadataKeyDown(object sender, KeyEventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnTargetPanelsMouseClick(object sender, MouseEventArgs e) {\r
+\r
+ //}\r
+\r
+ //private void OnExecuteClick(object sender, EventArgs e) {\r
+\r
+ //}\r
}\r
}\r
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
- CAAAAk1TRnQBSQFMAgEBAgEAATgBAQE4AQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+ CAAAAk1TRnQBSQFMAgEBAgEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
</value>\r
</data>\r
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
- <data name="picClearFilter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+ <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
<value>\r
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAJ9JREFUSEvt\r
lFEKgzAQBXOJ9hC2vf+XHsK257FvAgtrkLjB9EsHHhow86KRpIvz8lJG5ZZHde7KpDzyKAgTFuWt1EqQ\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.7.8")]\r
-[assembly: AssemblyFileVersion("2.0.7.8")]\r
+[assembly: AssemblyVersion("2.0.8.0")]\r
+[assembly: AssemblyFileVersion("2.0.8.0")]\r
// class via a tool like ResGen or Visual Studio.\r
// To add or remove a member, edit your .ResX file then rerun ResGen\r
// with the /str option, or rebuild your VS project.\r
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
internal class Resources {\r
}\r
}\r
\r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_cached_black_18dp {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_cached_black_18dp", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
/// <summary>\r
/// Looks up a localized resource of type System.Drawing.Bitmap.\r
/// </summary>\r
<data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
+ <data name="ic_cached_black_18dp" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>..\Resources\ic_cached_black_18dp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
</root>
\ No newline at end of file
return true;\r
}\r
\r
- private void Reset() {\r
+ public void Reset() {\r
Clear();\r
cache = null;\r
Shutdown();\r
public interface ISource : IBindingListView {\r
DataGridViewColumn[] Columns { get; }\r
void Startup(Uri address);\r
+ void Reset();\r
}\r
}
\ No newline at end of file
InnerStartup();\r
}\r
\r
-\r
+ public void Reset() {\r
+ if (nexioAPI != null)\r
+ nexioAPI.Close();\r
+ Clear();\r
+ InnerStartup();\r
+ }\r
}\r
}\r
-using System;\r
+using NLog;\r
+using System;\r
using System.Windows.Forms;\r
\r
namespace MaestroShared.Controls {\r
public class DoubleClickTreeView : TreeView {\r
public delegate void OnNodeDoubleClick(object sender, TreeNodeMouseClickEventArgs args);\r
-\r
+ private static Logger logger = LogManager.GetCurrentClassLogger();\r
public OnNodeDoubleClick NodeDoubleClick;\r
\r
protected override void WndProc(ref Message m) {\r
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory -Dorg.eclipse.epp.logging.aeri.skipReports=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djobengine.jobsteps.root="${workspace_loc}/user.jobengine.executors/config" -Djobengine.jobtemplates.root="${workspace_loc}/user.jobengine.executors/jobtemplates" -Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.db.user=db2admin -Djobengine.db.password=password -Djobengine.loglevel=INFO -Dlog4j.configurationFile="${workspace_loc}/-configuration/log4j2.xml" -Djobengine.jobsteps.alternate.root="${workspace_loc}/user.jobengine.executors/bin/" -Djetty.home="${workspace_loc:}/-configuration/jetty" -Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml -Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty -Djava.io.tmpdir=c:\temp\jetty -Djobengine.octopus.api.address=http://10.10.1.11/api/v1 -Djobengine.octopus.api.user=mam -Djobengine.octopus.api.password=napocska -Djobengine.nosql.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.nosql.db.user=db2admin -Djobengine.nosql.db.password=password -Djobengine.nosql.db.schema=test -Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl -Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium -Djobengine.jobscheduling.config="${workspace_loc}/-configuration/scheduledjobs.json" -Dnexio.host=10.10.1.55 -Dnexio.disable=true -Djobengine.octopus.rundowns.name=test_rundowns -Djobengine.octopus.storyfolders.name=test_storyfolders -Djobengine.octopus.stories.name=test_stories -Dmediacube.auth.location="${workspace_loc}/-configuration/mediacube-auth.properties""/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory -Dorg.eclipse.epp.logging.aeri.skipReports=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djobengine.jobsteps.root="${workspace_loc}/user.jobengine.executors/config" -Djobengine.jobtemplates.root="${workspace_loc}/user.jobengine.executors/jobtemplates" -Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.db.user=db2admin -Djobengine.db.password=password -Djobengine.loglevel=INFO -Dlog4j.configurationFile="${workspace_loc}/-configuration/log4j2.xml" -Djobengine.jobsteps.alternate.root="${workspace_loc}/user.jobengine.executors/bin/" -Djetty.home="${workspace_loc:}/-configuration/jetty" -Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml -Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty -Djava.io.tmpdir=c:\temp\jetty -Djobengine.octopus.api.address=http://10.10.1.11/api/v1 -Djobengine.octopus.api.user=mam -Djobengine.octopus.api.password=napocska -Djobengine.nosql.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.nosql.db.user=db2admin -Djobengine.nosql.db.password=password -Djobengine.nosql.db.schema=test -Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl -Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium -Djobengine.jobscheduling.config="${workspace_loc}/-configuration/scheduledjobs.json" -Dnexio.host=10.10.1.55 -Dnexio.disable=false -Djobengine.octopus.rundowns.name=test_rundowns -Djobengine.octopus.storyfolders.name=test_storyfolders -Djobengine.octopus.stories.name=test_stories -Dmediacube.auth.location="${workspace_loc}/-configuration/mediacube-auth.properties""/>\r
<stringAttribute key="pde.version" value="3.3"/>\r
<booleanAttribute key="show_selected_only" value="false"/>\r
<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
<jobtemplate name="Archivált anyag visszatöltése" multiInstance="true">\r
<declarations>\r
<parameters>\r
- <parameter name="trafficOutputPath" type="java.lang.String" />\r
- <parameter name="octopusOutputPath" type="java.lang.String" />\r
- <parameter name="genericOutputPath" type="java.lang.String" />\r
<parameter name="basket" type="java.util.ArrayList" />\r
<parameter name="houseId" type="java.lang.String" />\r
<parameter name="recipient" type="java.lang.String" />\r
- <parameter name="killDateDays" type="java.lang.Integer"/>\r
</parameters>\r
</declarations>\r
<commands>\r
<calljobstep type="user.jobengine.server.steps.BatchRetrieveForkStep" weight="1">\r
<inputs>\r
- <input>\r
- <parameter name="trafficOutputPath" />\r
- </input>\r
- <input>\r
- <parameter name="octopusOutputPath" />\r
- </input>\r
- <input>\r
- <parameter name="genericOutputPath" />\r
- </input>\r
<input>\r
<parameter name="basket" />\r
</input>\r
<input>\r
<parameter name="recipient" />\r
</input>\r
- <input>\r
- <parameter name="killDateDays" />\r
- </input>\r
</inputs>\r
</calljobstep>\r
</commands>\r
db2ts "drop index media_title1 for text connect to mc"\r
db2ts "drop index media_desc1 for text connect to mc"\r
db2ts "drop index media_houseid1 for text connect to mc"\r
+\r
+\r
+DROP TABLE DB2ADMIN.MEDIADESCRIPTION\r
+\r
+CREATE TABLE DB2ADMIN.MEDIADESCRIPTION ( \r
+ ID BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,\r
+ ITEMID BIGINT NOT NULL,\r
+ MEDIAID BIGINT NOT NULL,\r
+ MEDIAFILEID BIGINT NOT NULL,\r
+ DESCRIPTION CLOB(400000) NOT LOGGED COMPACT,\r
+ CONSTRAINT PK_MEDIADESCRIPTION PRIMARY KEY(ID)\r
+)\r
+\r
+ALTER TABLE DB2ADMIN.MEDIADESCRIPTION\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_ITEMID\r
+ FOREIGN KEY(ITEMID)\r
+ REFERENCES DB2ADMIN.ITEM(ID)\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_MEDIAID\r
+ FOREIGN KEY(MEDIAID)\r
+ REFERENCES DB2ADMIN.MEDIA(ID)\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_MEDIAFILEID\r
+ FOREIGN KEY(MEDIAFILEID)\r
+ REFERENCES DB2ADMIN.MEDIAFILE(ID)\r
+ \r
+db2ts "drop index media_description for text connect to mc" \r
+db2ts "create index media_description for text on MEDIADESCRIPTION(DESCRIPTION) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc"\r
+db2ts "update index media_description for text connect to mc"\r
+
\ No newline at end of file
--- /dev/null
+select * from media where archived is null\r
+update media set archived = modified where archived is null\r
+\r
+--Extra view for FT update\r
+CREATE VIEW DB2ADMIN.VW_ITEMS_DESCRIPTION as\r
+select\r
+i.id as itemid, \r
+i.created as itemcreated, \r
+i.houseid as itemhouseid, \r
+i.title as itemtitle, \r
+i.description as itemdescription,\r
+m.id as mediaid,\r
+m.created as mediacreated, \r
+m.archived,\r
+m.length,\r
+m.description as mediadescription, \r
+it.name as mediatype, \r
+m.houseid as mediahouseid, \r
+m.title as mediatitle, \r
+mf.id as mediafileid,\r
+mf.houseid as mediafilehouseid\r
+from mediafile mf\r
+left outer join media m on (m.id = mf.mediaid) \r
+left outer join item i on (i.id = m.itemid) \r
+left outer join itemtype it on (it.id = m.itemtypeid) \r
+where mf.storeid = 1\r
+\r
+--Manual update\r
+insert into mediadescription (itemid, mediaid, mediafileid, description)\r
+select \r
+ itemid,\r
+ mediaid, \r
+ mediafileid,\r
+ COALESCE(hundate(archived), '') concat ' ' \r
+ concat COALESCE(defdate(archived), '') concat ' ' \r
+ concat COALESCE(itemhouseid, '') concat ' ' \r
+ concat COALESCE(itemtitle, '') concat ' ' \r
+ concat COALESCE(itemdescription,'') concat ' ' \r
+ concat COALESCE(mediahouseid, '') concat ' ' \r
+ concat COALESCE(mediatitle, '') concat ' ' \r
+ concat COALESCE(mediadescription, '') concat ' ' \r
+ concat COALESCE(mediafilehouseid, '')\r
+from vw_items_description \r
+where mediafileid not in (select mediafileid from mediadescription)\r
+\r
+select count(*) from vw_items_description where mediafileid not in (select mediafileid from mediadescription) \r
+select * from vw_items_description where mediafileid not in (select mediafileid from mediadescription) \r
+\r
+--Insert trigger\r
+create trigger trg_mediafile_after_insert after insert\r
+on mediafile\r
+referencing new as n\r
+for each row\r
+when (n.storeid = 1)\r
+begin atomic\r
+ insert into mediadescription (itemid, mediaid, mediafileid, description)\r
+ select \r
+ itemid,\r
+ mediaid, \r
+ mediafileid,\r
+ COALESCE(hundate(archived), '') concat ' ' \r
+ concat COALESCE(defdate(archived), '') concat ' ' \r
+ concat COALESCE(itemhouseid, '') concat ' ' \r
+ concat COALESCE(itemtitle, '') concat ' ' \r
+ concat COALESCE(itemdescription,'') concat ' ' \r
+ concat COALESCE(mediahouseid, '') concat ' ' \r
+ concat COALESCE(mediatitle, '') concat ' ' \r
+ concat COALESCE(mediadescription, '') concat ' ' \r
+ concat COALESCE(mediafilehouseid, '')\r
+ from vw_items_description \r
+ where mediafileid = n.id;\r
+end\r
+\r
+\r
+--Extra FT table\r
+DROP TABLE DB2ADMIN.MEDIADESCRIPTION\r
+\r
+CREATE TABLE DB2ADMIN.MEDIADESCRIPTION ( \r
+ ID BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL,\r
+ ITEMID BIGINT NOT NULL,\r
+ MEDIAID BIGINT NOT NULL,\r
+ MEDIAFILEID BIGINT NOT NULL,\r
+ DESCRIPTION CLOB(400000) NOT LOGGED COMPACT,\r
+ CONSTRAINT PK_MEDIADESCRIPTION PRIMARY KEY(ID)\r
+)\r
+\r
+ALTER TABLE DB2ADMIN.MEDIADESCRIPTION\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_ITEMID\r
+ FOREIGN KEY(ITEMID)\r
+ REFERENCES DB2ADMIN.ITEM(ID)\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_MEDIAID\r
+ FOREIGN KEY(MEDIAID)\r
+ REFERENCES DB2ADMIN.MEDIA(ID)\r
+ADD CONSTRAINT FK_MEDIADESCRIPTION_MEDIAFILEID\r
+ FOREIGN KEY(MEDIAFILEID)\r
+ REFERENCES DB2ADMIN.MEDIAFILE(ID)\r
+\r
+--Timestamp to formatted string\r
+create function hundate(TS timestamp) \r
+returns varchar(10) \r
+return \r
+with tmp (dd,mm,yyyy,hh,mi,ss,nnnnnn) as \r
+( \r
+ select \r
+ substr( digits (day(TS)),9), \r
+ substr( digits (month(TS)),9) , \r
+ rtrim(char(year(TS))) , \r
+ substr( digits (hour(TS)),9), \r
+ substr( digits (minute(TS)),9), \r
+ substr( digits (second(TS)),9), \r
+ rtrim(char(microsecond(TS))) \r
+ from sysibm.sysdummy1 \r
+ ) \r
+select yyyy || '.' || mm || '.' || dd from tmp \r
+\r
+create function defdate(TS timestamp) \r
+returns varchar(10) \r
+return \r
+with tmp (dd,mm,yyyy,hh,mi,ss,nnnnnn) as \r
+( \r
+ select \r
+ substr( digits (day(TS)),9), \r
+ substr( digits (month(TS)),9) , \r
+ rtrim(char(year(TS))) , \r
+ substr( digits (hour(TS)),9), \r
+ substr( digits (minute(TS)),9), \r
+ substr( digits (second(TS)),9), \r
+ rtrim(char(microsecond(TS))) \r
+ from sysibm.sysdummy1 \r
+ ) \r
+select yyyy || mm || dd from tmp \r
+\r
+\r
+SELECT hundate(TIMESTAMP ('2002-10-20-12.00.00.000000')) FROM SYSIBM.SYSDUMMY1\r
+SELECT defdate(TIMESTAMP ('2002-10-20-12.00.00.000000')) FROM SYSIBM.SYSDUMMY1\r
+SELECT hundate(null) FROM SYSIBM.SYSDUMMY1\r
+\r
+\r
+--TESZT\r
+drop table test1\r
+create table test1 (\r
+ value varchar(10)\r
+)\r
+drop table test2\r
+create table test2 (\r
+ value varchar(10)\r
+)\r
+\r
+\r
+drop trigger trg_test1\r
+create trigger trg_test1 after insert\r
+on test1\r
+referencing new as n\r
+for each row\r
+when (n.value='ccc')\r
+begin atomic\r
+ insert into test2 (value) values (n.value);\r
+end\r
+\r
+insert into test1 (value) values ('ccc'),('ddd')\r
+\r
+select * from test2\r
+\r
return resultQuery.toString();\r
}\r
\r
- // sql.append("select");\r
- // sql.append(" ");\r
- // sql.append("i.id itemid,");\r
- // sql.append("i.created itemcreated,");\r
- // sql.append("i.houseid itemhouseid,");\r
- // sql.append("i.title itemtitle,");\r
- // sql.append("m.id mediaid,");\r
- // sql.append("m.created mediacreated,");\r
- // sql.append("m.archived,");\r
- // sql.append("m.length,");\r
- // sql.append("it.name mediatype,");\r
- // sql.append("m.houseid mediahouseid,");\r
- // sql.append("m.title mediatitle,");\r
- // sql.append("mf.id mediafileid,");\r
- // sql.append("mf.houseid mediafilehouseid");\r
- // sql.append(" ");\r
- // sql.append("from mediafile mf");\r
- // sql.append(" ");\r
- // sql.append("left outer join media m on (m.id = mf.mediaid)");\r
- // sql.append(" ");\r
- // sql.append("left outer join item i on (i.id = m.itemid)");\r
- // sql.append(" ");\r
- // sql.append("left outer join itemtype it on (it.id = m.itemtypeid)");\r
- // sql.append(" ");\r
- // sql.append("where mf.storeid = 1 and (");\r
- // sql.append("contains(i.title, ?) >= 1");\r
- // sql.append(" ");\r
- // sql.append("or contains(i.description, ?) >= 1");\r
- // sql.append(" ");\r
- // sql.append("or contains(m.title, ?) >= 1");\r
- // sql.append(" ");\r
- // sql.append("or contains(m.description, ?) >= 1");\r
- // sql.append(" ");\r
- // sql.append("or contains(mf.houseid, ?) >= 1");\r
- // sql.append(")");\r
- // if (typeIDs != null)\r
- // sql.append(" and m.itemtypeid in ").append(typeCriteria.toString());\r
private PreparedStatement createArchiveMediaSearchStatement(Connection connection, String criteria, String orderBy, boolean orderAscending,\r
List<String> typeIDs) throws SQLException {\r
StringBuilder typeCriteria = new StringBuilder();\r
typeCriteria.append(")");\r
}\r
\r
+ String columNames = getColumnNames();\r
+\r
+ StringBuilder sql = new StringBuilder();\r
+ sql.append("SELECT ");\r
+ sql.append(columNames);\r
+ sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md WHERE i.id = md.itemid AND m.id = md.mediaid AND mf.id = md.mediafileid");\r
+ if (typeIDs != null) {\r
+ sql.append(" AND m.itemtypeid IN ");\r
+ sql.append(typeCriteria.toString());\r
+ }\r
+\r
+ sql.append(" AND CONTAINS(md.description, ?) >= 1");\r
+ sql.append(" ORDER BY ");\r
+\r
+ if (orderBy == null) {\r
+ sql.append("itemtitle desc, mediaitemtypeid");\r
+ } else {\r
+ sql.append(orderBy);\r
+ sql.append(orderAscending ? " ASC" : " DESC");\r
+ }\r
+\r
+ String query = sql.toString();\r
+ logger.info(query);\r
+ PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);\r
+ st.setString(1, criteria);\r
+ return st;\r
+ }\r
+\r
+ private PreparedStatement createArchiveMediaSearchStatement1(Connection connection, String criteria, String orderBy, boolean orderAscending,\r
+ List<String> typeIDs) throws SQLException {\r
+ StringBuilder typeCriteria = new StringBuilder();\r
+ if (typeIDs != null) {\r
+ typeCriteria.append("(");\r
+ for (int i = 0; i < typeIDs.size(); i++) {\r
+ typeCriteria.append(typeIDs.get(i));\r
+ if (i < typeIDs.size() - 1)\r
+ typeCriteria.append(",");\r
+ }\r
+ typeCriteria.append(")");\r
+ }\r
+\r
String columNames = getColumnNames();\r
StringBuilder innerSql = new StringBuilder();\r
innerSql.append("SELECT DISTINCT ");\r
<label value="@load(each.media.title)" />\r
<label value="@load(each.media.mediaFilesName)" />\r
<cell>\r
- <label style="font-size:14px" value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />\r
- <image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
- <attribute name="visible" if="${each.media.mediaFilesCount lt 2}">\r
- false\r
- </attribute> \r
- </image>\r
- <image src="/img/ic_visibility_off_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
- <attribute name="visible" if="${each.media.mediaFilesCount gt 1}">\r
- false\r
- </attribute> \r
- </image>\r
+ <vlayout>\r
+ <hlayout>\r
+ <label style="font-size:14px" value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />\r
+ <image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
+ <attribute name="visible" if="${each.media.mediaFilesCount lt 2}">\r
+ false\r
+ </attribute> \r
+ </image>\r
+ <image src="/img/ic_visibility_off_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
+ <attribute name="visible" if="${each.media.mediaFilesCount gt 1}">\r
+ false\r
+ </attribute> \r
+ </image>\r
+ </hlayout>\r
+ <label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />\r
+ </vlayout>\r
</cell>\r
</row>\r
</template>\r
-version=2.3.6\r
+version=2.3.7\r
footer=2016 © Copyright User Rendszerház Kft.\r
\r
login_info=Információ\r
--- /dev/null
+package user.jobengine.zk.model;\r
+\r
+import java.text.SimpleDateFormat;\r
+import java.util.Date;\r
+\r
+import org.zkoss.bind.BindContext;\r
+import org.zkoss.bind.Converter;\r
+import org.zkoss.zul.Label;\r
+\r
+public class ShortDateConverter implements Converter<String, Date, Label> {\r
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd");\r
+\r
+ @Override\r
+ public Date coerceToBean(String text, Label label, BindContext context) {\r
+ return null;\r
+ }\r
+\r
+ @Override\r
+ public String coerceToUi(Date date, Label label, BindContext context) {\r
+ return formatter.format(date);\r
+ }\r
+\r
+}\r
logger.info("Created");
instance = this;
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- if (bundleContext != null)
+ if (bundleContext != null) {
bundleContext.registerService(NexioWSServlet.class, this, null);
+ }
}
public void addSession(Session session) {
https://git.useribm.hu / mediacube.git / commitdiff
