diff --git a/unimarc/.cursor/settings.json b/unimarc/.cursor/settings.json deleted file mode 100644 index e1a7ec4..0000000 --- a/unimarc/.cursor/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "hooks": { - "conversation-start": "새로운 대화를 시작할 때 항상 CLAUDE.md 파일을 자동으로 읽고 프로젝트 컨텍스트를 파악하세요", - "user-prompt-submit": "작업을 시작하기 전에 항상 CLAUDE.md 파일을 읽고 참조하세요" - } - } \ No newline at end of file diff --git a/unimarc/.vscode/settings.json b/unimarc/.vscode/settings.json deleted file mode 100644 index 4189e5f..0000000 --- a/unimarc/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "dotnet.preferCSharpExtension": true, - "dotnet.defaultSolution": "unimarc.sln" -} \ No newline at end of file diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index 4a508cf..5c08229 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.09.24.2340")] -[assembly: AssemblyFileVersion("2025.09.24.2340")] +[assembly: AssemblyVersion("2025.10.11.0100")] +[assembly: AssemblyFileVersion("2025.10.11.0100")] diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index 8eebd8a..6b62a44 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -136,7 +136,7 @@ namespace WindowsFormsApp1 // stringInClipboard= stringInClipboard.Replace("\r", ""); if (stringInClipboard == null) return; List rowsInClipboard = stringInClipboard.Split(rowSpliteter, StringSplitOptions.None).ToList(); - if(rowsInClipboard.Last().isEmpty()) rowsInClipboard.RemoveAt(rowsInClipboard.Count - 1); + if (rowsInClipboard.Last().isEmpty()) rowsInClipboard.RemoveAt(rowsInClipboard.Count - 1); var dv = sender as DataGridView; @@ -2165,12 +2165,15 @@ namespace WindowsFormsApp1 List Field = new List(); // 가변길이필드 저장용 Marc = Marc.Replace("", "▼").Replace("", "▲"); + Marc = Marc.Replace(((char)0x1D).ToString(), ""); + Marc = Marc.Replace(((char)0x1E).ToString(), ""); + Marc = Marc.Replace(((char)0x1F).ToString(), ""); int StartIdx = 0; // 리더부를 제외한 디렉토리, 가변길이필드 저장 - string[] data = Marc.Substring(24).Split('▲'); - for (int a = 1; a < data.Length - 1; a++) + string[] data = Marc.Substring(24).Split(new char[] { '▲' }, StringSplitOptions.RemoveEmptyEntries); + for (int a = 1; a < data.Length; a++) { TagNum.Add(data[0].Substring(StartIdx, 3)); StartIdx += 12; @@ -2186,10 +2189,20 @@ namespace WindowsFormsApp1 else if (res.StartsWith("00")) { res += "\t \t" + Field[a]; } else { - string temp = Field[a].Insert(2, "\t"); - res += "\t" + temp; + if (Field[a].Replace("▲","").Trim().isEmpty()) //no data + { + Console.WriteLine("field length error"); + res = string.Empty; + } + else + { + string temp = Field[a].Insert(2, "\t"); + res += "\t" + temp; + } + } - result += res + "\n"; + if (res.isEmpty() == false) + result += res + "\n"; } return result; } diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index a99f8f0..292d1a0 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -29,7 +29,6 @@ private void InitializeComponent() { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -37,6 +36,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan)); this.panel1 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); this.btn_ClassSymbol = new System.Windows.Forms.Button(); @@ -118,8 +118,6 @@ this.tb_Garo = new System.Windows.Forms.TextBox(); this.panel7 = new System.Windows.Forms.Panel(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.printDocument1 = new System.Drawing.Printing.PrintDocument(); - this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.reg_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -142,6 +140,10 @@ this.marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.search_tag2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.printDocument1 = new System.Drawing.Printing.PrintDocument(); + this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.panel1.SuspendLayout(); this.panel4.SuspendLayout(); this.panel3.SuspendLayout(); @@ -150,6 +152,7 @@ this.panel6.SuspendLayout(); this.panel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -994,8 +997,9 @@ // // panel7 // - this.panel7.Controls.Add(this.checkBox1); this.panel7.Controls.Add(this.dataGridView1); + this.panel7.Controls.Add(this.toolStrip1); + this.panel7.Controls.Add(this.checkBox1); this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Location = new System.Drawing.Point(0, 70); this.panel7.Name = "panel7"; @@ -1047,7 +1051,7 @@ this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1730, 783); + this.dataGridView1.Size = new System.Drawing.Size(1730, 758); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -1055,21 +1059,6 @@ this.dataGridView1.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dataGridView1_SortCompare); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // - // printDocument1 - // - this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint); - this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage); - // - // printPreviewDialog1 - // - this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0); - this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0); - this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300); - this.printPreviewDialog1.Enabled = true; - this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon"))); - this.printPreviewDialog1.Name = "printPreviewDialog1"; - this.printPreviewDialog1.Visible = false; - // // idx // this.idx.HeaderText = "idx"; @@ -1244,6 +1233,41 @@ this.colCheck.TrueValue = "T"; this.colCheck.Width = 27; // + // printDocument1 + // + this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint); + this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage); + // + // printPreviewDialog1 + // + this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0); + this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0); + this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300); + this.printPreviewDialog1.Enabled = true; + this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon"))); + this.printPreviewDialog1.Name = "printPreviewDialog1"; + this.printPreviewDialog1.Visible = false; + // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 758); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1730, 25); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(59, 22); + this.toolStripButton1.Text = "delete"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // Marc_Plan // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1270,6 +1294,8 @@ this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); } @@ -1383,5 +1409,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn marc; private System.Windows.Forms.DataGridViewTextBoxColumn search_tag2; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.resx b/unimarc/unimarc/마크/Marc_Plan.resx index 7111927..3b86c08 100644 --- a/unimarc/unimarc/마크/Marc_Plan.resx +++ b/unimarc/unimarc/마크/Marc_Plan.resx @@ -120,13 +120,31 @@ True + + 300, 6 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X + /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t + I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM + cX79DFKrHHD5d9D26hvicx4pABt2lpg10zYzU0zr7+e3xXGcrkEB2O2TNec9nJFwB3alZn5jZorfeDZh + 6Q3g8s06BeCoKF4MRURoH1+BY2oNCbeb0TIclIYxOhzf8frTOuo7FxCbbVIAzpni0iceEc8vhzEwGkJD + lx83ymxifejdKjRNk/8PWnyIyTQqAJek0jqHwfEVscu31baIu8+90sTE4nY025dQ2/5FIPpnXlzKuK8A + HBUzHot52djqQ6HZhfR7IwK4mKpHtvEDMqvfCiQ6zaAAXM8x94aIWTNrLLG4kVUzgaTSPlzLtyJOZxbb + 1wtfyg4Q+AfA3aZlButjSfxGcUJBk4g5tuP3haQKRKXcUQDOmbvNTpPOJeFFjordZmbWTNvMTHFUcpUC + nOccAdABIDXXE1nzAAAAAElFTkSuQmCC + + 6, 7 138, 6 - AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA