diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index c4a4298..2ff12b6 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 6eab169..eabee89 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index c2dc8ec..ac6380a 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index 961c498..5982604 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache
index f5e894a..83b6e0f 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index 3aed1bd..fb55eb5 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 6eab169..eabee89 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index c2dc8ec..ac6380a 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index 961c498..5982604 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs
index 5e00660..50a868c 100644
--- a/unimarc/unimarc/마크/Check_copy.Designer.cs
+++ b/unimarc/unimarc/마크/Check_copy.Designer.cs
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.SearchCount = new System.Windows.Forms.NumericUpDown();
this.btn_Close = new System.Windows.Forms.Button();
@@ -44,51 +44,62 @@
this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.webBrowser1 = new System.Windows.Forms.WebBrowser();
+ this.btn_ApplyFilter = new System.Windows.Forms.Button();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.panel5 = new System.Windows.Forms.Panel();
+ this.panel6 = new System.Windows.Forms.Panel();
+ this.chk_spChar = new System.Windows.Forms.CheckBox();
+ this.chk_RemoveBrit = new System.Windows.Forms.CheckBox();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.panel3.SuspendLayout();
+ this.panel4.SuspendLayout();
+ this.panel5.SuspendLayout();
+ this.panel6.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel1.Controls.Add(this.SearchCount);
- this.panel1.Controls.Add(this.btn_Close);
- this.panel1.Controls.Add(this.label2);
- this.panel1.Controls.Add(this.tb_SearchTarget);
- this.panel1.Controls.Add(this.label1);
- this.panel1.Location = new System.Drawing.Point(12, 12);
+ this.panel1.Controls.Add(this.btn_SearchList);
+ this.panel1.Controls.Add(this.btn_Start);
+ this.panel1.Controls.Add(this.btn_Stop);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 34);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(642, 34);
+ this.panel1.Size = new System.Drawing.Size(635, 34);
this.panel1.TabIndex = 0;
//
// SearchCount
//
- this.SearchCount.Location = new System.Drawing.Point(436, 6);
+ this.SearchCount.Location = new System.Drawing.Point(429, 6);
this.SearchCount.Maximum = new decimal(new int[] {
500,
0,
0,
0});
this.SearchCount.Name = "SearchCount";
- this.SearchCount.Size = new System.Drawing.Size(67, 21);
+ this.SearchCount.Size = new System.Drawing.Size(54, 21);
this.SearchCount.TabIndex = 2;
this.SearchCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btn_Close
//
- this.btn_Close.Location = new System.Drawing.Point(561, 4);
+ this.btn_Close.Location = new System.Drawing.Point(554, 4);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(75, 24);
this.btn_Close.TabIndex = 2;
this.btn_Close.Text = "닫 기";
this.btn_Close.UseVisualStyleBackColor = true;
+ this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(384, 10);
+ this.label2.Location = new System.Drawing.Point(382, 10);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(45, 12);
this.label2.TabIndex = 0;
@@ -96,7 +107,7 @@
//
// tb_SearchTarget
//
- this.tb_SearchTarget.Location = new System.Drawing.Point(73, 6);
+ this.tb_SearchTarget.Location = new System.Drawing.Point(66, 6);
this.tb_SearchTarget.Name = "tb_SearchTarget";
this.tb_SearchTarget.Size = new System.Drawing.Size(294, 21);
this.tb_SearchTarget.TabIndex = 1;
@@ -105,7 +116,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(15, 10);
+ this.label1.Location = new System.Drawing.Point(8, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 0;
@@ -114,17 +125,20 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Controls.Add(this.btn_SearchList);
- this.panel2.Controls.Add(this.btn_Stop);
- this.panel2.Controls.Add(this.btn_Start);
- this.panel2.Location = new System.Drawing.Point(12, 52);
+ this.panel2.Controls.Add(this.SearchCount);
+ this.panel2.Controls.Add(this.tb_SearchTarget);
+ this.panel2.Controls.Add(this.label1);
+ this.panel2.Controls.Add(this.btn_Close);
+ this.panel2.Controls.Add(this.label2);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(642, 34);
+ this.panel2.Size = new System.Drawing.Size(635, 34);
this.panel2.TabIndex = 0;
//
// btn_SearchList
//
- this.btn_SearchList.Location = new System.Drawing.Point(11, 4);
+ this.btn_SearchList.Location = new System.Drawing.Point(4, 4);
this.btn_SearchList.Name = "btn_SearchList";
this.btn_SearchList.Size = new System.Drawing.Size(356, 24);
this.btn_SearchList.TabIndex = 3;
@@ -134,7 +148,7 @@
//
// btn_Stop
//
- this.btn_Stop.Location = new System.Drawing.Point(561, 4);
+ this.btn_Stop.Location = new System.Drawing.Point(554, 4);
this.btn_Stop.Name = "btn_Stop";
this.btn_Stop.Size = new System.Drawing.Size(75, 24);
this.btn_Stop.TabIndex = 2;
@@ -143,7 +157,7 @@
//
// btn_Start
//
- this.btn_Start.Location = new System.Drawing.Point(480, 4);
+ this.btn_Start.Location = new System.Drawing.Point(473, 4);
this.btn_Start.Name = "btn_Start";
this.btn_Start.Size = new System.Drawing.Size(75, 24);
this.btn_Start.TabIndex = 2;
@@ -154,23 +168,24 @@
// dataGridView1
//
this.dataGridView1.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.book_name,
this.book_comp,
this.Count});
- this.dataGridView1.Location = new System.Drawing.Point(13, 93);
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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(641, 627);
+ this.dataGridView1.Size = new System.Drawing.Size(635, 630);
this.dataGridView1.TabIndex = 1;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -195,29 +210,105 @@
//
// webBrowser1
//
- this.webBrowser1.Location = new System.Drawing.Point(661, 12);
+ this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webBrowser1.Location = new System.Drawing.Point(0, 0);
this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
this.webBrowser1.Name = "webBrowser1";
this.webBrowser1.ScriptErrorsSuppressed = true;
- this.webBrowser1.Size = new System.Drawing.Size(679, 708);
+ this.webBrowser1.Size = new System.Drawing.Size(717, 732);
this.webBrowser1.TabIndex = 2;
//
+ // btn_ApplyFilter
+ //
+ this.btn_ApplyFilter.Location = new System.Drawing.Point(473, 4);
+ this.btn_ApplyFilter.Name = "btn_ApplyFilter";
+ this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24);
+ this.btn_ApplyFilter.TabIndex = 2;
+ this.btn_ApplyFilter.Text = "필터적용";
+ this.btn_ApplyFilter.UseVisualStyleBackColor = true;
+ this.btn_ApplyFilter.Click += new System.EventHandler(this.btn_ApplyFilter_Click);
+ //
+ // panel3
+ //
+ this.panel3.Controls.Add(this.panel6);
+ this.panel3.Controls.Add(this.panel4);
+ this.panel3.Controls.Add(this.panel1);
+ this.panel3.Controls.Add(this.panel2);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel3.Location = new System.Drawing.Point(0, 0);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(635, 732);
+ this.panel3.TabIndex = 3;
+ //
+ // panel4
+ //
+ this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel4.Controls.Add(this.chk_RemoveBrit);
+ this.panel4.Controls.Add(this.btn_ApplyFilter);
+ this.panel4.Controls.Add(this.chk_spChar);
+ this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel4.Location = new System.Drawing.Point(0, 68);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(635, 34);
+ this.panel4.TabIndex = 2;
+ //
+ // panel5
+ //
+ this.panel5.Controls.Add(this.webBrowser1);
+ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel5.Location = new System.Drawing.Point(635, 0);
+ this.panel5.Name = "panel5";
+ this.panel5.Size = new System.Drawing.Size(717, 732);
+ this.panel5.TabIndex = 4;
+ //
+ // panel6
+ //
+ this.panel6.Controls.Add(this.dataGridView1);
+ this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel6.Location = new System.Drawing.Point(0, 102);
+ this.panel6.Name = "panel6";
+ this.panel6.Size = new System.Drawing.Size(635, 630);
+ this.panel6.TabIndex = 3;
+ //
+ // chk_spChar
+ //
+ this.chk_spChar.AutoSize = true;
+ this.chk_spChar.Location = new System.Drawing.Point(12, 8);
+ this.chk_spChar.Name = "chk_spChar";
+ this.chk_spChar.Size = new System.Drawing.Size(100, 16);
+ this.chk_spChar.TabIndex = 0;
+ this.chk_spChar.Text = "특수문자 제거";
+ this.chk_spChar.UseVisualStyleBackColor = true;
+ //
+ // chk_RemoveBrit
+ //
+ this.chk_RemoveBrit.AutoSize = true;
+ this.chk_RemoveBrit.Location = new System.Drawing.Point(131, 8);
+ this.chk_RemoveBrit.Name = "chk_RemoveBrit";
+ this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16);
+ this.chk_RemoveBrit.TabIndex = 0;
+ this.chk_RemoveBrit.Text = "괄호안의 문자 제거";
+ this.chk_RemoveBrit.UseVisualStyleBackColor = true;
+ //
// Check_copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1352, 732);
- this.Controls.Add(this.webBrowser1);
- this.Controls.Add(this.dataGridView1);
- this.Controls.Add(this.panel2);
- this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel5);
+ this.Controls.Add(this.panel3);
this.Name = "Check_copy";
this.Text = "복본조사";
this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).EndInit();
this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.panel3.ResumeLayout(false);
+ this.panel4.ResumeLayout(false);
+ this.panel4.PerformLayout();
+ this.panel5.ResumeLayout(false);
+ this.panel6.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -239,5 +330,12 @@
public System.Windows.Forms.TextBox tb_SearchTarget;
public System.Windows.Forms.DataGridView dataGridView1;
public System.Windows.Forms.Button btn_SearchList;
+ private System.Windows.Forms.Button btn_ApplyFilter;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.Panel panel6;
+ private System.Windows.Forms.Panel panel4;
+ private System.Windows.Forms.Panel panel5;
+ private System.Windows.Forms.CheckBox chk_spChar;
+ private System.Windows.Forms.CheckBox chk_RemoveBrit;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs
index bbe7ff0..93afc17 100644
--- a/unimarc/unimarc/마크/Check_copy.cs
+++ b/unimarc/unimarc/마크/Check_copy.cs
@@ -556,5 +556,64 @@ namespace WindowsFormsApp1.Mac
}
return;
}
+
+ private void btn_ApplyFilter_Click(object sender, EventArgs e)
+ {
+ int count = dataGridView1.Rows.Count;
+ if (count <= 1)
+ return;
+
+ // 특수문자 제거
+ if (chk_spChar.Checked)
+ {
+ RemoveSpecialChar(count);
+ }
+
+ // 괄호안의 문자 제거
+ if (chk_RemoveBrit.Checked)
+ {
+ RemoveInBrit(count);
+ }
+
+ }
+
+ ///
+ /// 특수문자 제거
+ ///
+ void RemoveSpecialChar(int count)
+ {
+ for (int a = 0; a < count; a++)
+ {
+ if (dataGridView1.Rows[a].Cells["book_name"].Value == null)
+ break;
+
+ string Target = dataGridView1.Rows[a].Cells["book_name"].Value.ToString();
+ string res = Regex.Replace(Target, @"[^a-zA-Z0-9가-힣_\s()]", "", RegexOptions.Singleline);
+
+ dataGridView1.Rows[a].Cells["book_name"].Value = res.Trim();
+ }
+ }
+
+ ///
+ /// 괄호안의 문자 제거
+ ///
+ void RemoveInBrit(int count)
+ {
+ String_Text st = new String_Text();
+ for (int a = 0; a < count; a++)
+ {
+ if (dataGridView1.Rows[a].Cells["book_name"].Value == null)
+ break;
+
+ string Target = dataGridView1.Rows[a].Cells["book_name"].Value.ToString();
+
+ dataGridView1.Rows[a].Cells["book_name"].Value = st.RemoveWordInBracket(Target).Trim();
+ }
+ }
+
+ private void btn_Close_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
}
}
diff --git a/unimarc/unimarc/마크/DLS_Copy.Designer.cs b/unimarc/unimarc/마크/DLS_Copy.Designer.cs
index 3163c83..f45db07 100644
--- a/unimarc/unimarc/마크/DLS_Copy.Designer.cs
+++ b/unimarc/unimarc/마크/DLS_Copy.Designer.cs
@@ -31,37 +31,42 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DLS_Copy));
this.label1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.panel3 = new System.Windows.Forms.Panel();
+ this.panel8 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.Book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Check = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.panel2 = new System.Windows.Forms.Panel();
this.panel5 = new System.Windows.Forms.Panel();
+ this.chk_RemoveBrit = new System.Windows.Forms.CheckBox();
+ this.chk_spChar = new System.Windows.Forms.CheckBox();
+ this.btn_ApplyFilter = new System.Windows.Forms.Button();
+ this.panel3 = new System.Windows.Forms.Panel();
this.btn_Reflesh008 = new System.Windows.Forms.Button();
- this.rBtn_ISBN = new System.Windows.Forms.RadioButton();
- this.rBtn_BookName = new System.Windows.Forms.RadioButton();
this.label2 = new System.Windows.Forms.Label();
+ this.rBtn_ISBN = new System.Windows.Forms.RadioButton();
this.btn_Search = new System.Windows.Forms.Button();
+ this.rBtn_BookName = new System.Windows.Forms.RadioButton();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.btn_Connect = new System.Windows.Forms.Button();
this.lbl_PW = new System.Windows.Forms.Label();
this.lbl_Area = new System.Windows.Forms.Label();
this.lbl_ID = new System.Windows.Forms.Label();
this.lbl_Client = new System.Windows.Forms.Label();
this.tb_SearchClient = new System.Windows.Forms.TextBox();
this.btn_Close = new System.Windows.Forms.Button();
- this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.panel4 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
+ this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.panel6 = new System.Windows.Forms.Panel();
this.btn_Back = new System.Windows.Forms.Button();
this.btn_Forward = new System.Windows.Forms.Button();
this.tb_URL = new System.Windows.Forms.TextBox();
- this.btn_Connect = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
- this.panel3.SuspendLayout();
+ this.panel8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
- this.panel2.SuspendLayout();
this.panel5.SuspendLayout();
+ this.panel3.SuspendLayout();
+ this.panel2.SuspendLayout();
this.panel4.SuspendLayout();
this.panel7.SuspendLayout();
this.panel6.SuspendLayout();
@@ -70,7 +75,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(7, 13);
+ this.label1.Location = new System.Drawing.Point(7, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 0;
@@ -79,6 +84,8 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.panel8);
+ this.panel1.Controls.Add(this.panel5);
this.panel1.Controls.Add(this.panel3);
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
@@ -87,15 +94,14 @@
this.panel1.Size = new System.Drawing.Size(364, 734);
this.panel1.TabIndex = 1;
//
- // panel3
+ // panel8
//
- this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel3.Controls.Add(this.dataGridView1);
- this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel3.Location = new System.Drawing.Point(0, 70);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(362, 662);
- this.panel3.TabIndex = 4;
+ this.panel8.Controls.Add(this.dataGridView1);
+ this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel8.Location = new System.Drawing.Point(0, 105);
+ this.panel8.Name = "panel8";
+ this.panel8.Size = new System.Drawing.Size(362, 627);
+ this.panel8.TabIndex = 5;
//
// dataGridView1
//
@@ -109,7 +115,7 @@
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 31;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(360, 660);
+ this.dataGridView1.Size = new System.Drawing.Size(362, 627);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -131,11 +137,119 @@
this.Check.Name = "Check";
this.Check.Width = 70;
//
+ // panel5
+ //
+ this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel5.Controls.Add(this.chk_RemoveBrit);
+ this.panel5.Controls.Add(this.chk_spChar);
+ this.panel5.Controls.Add(this.btn_ApplyFilter);
+ this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel5.Location = new System.Drawing.Point(0, 70);
+ this.panel5.Name = "panel5";
+ this.panel5.Size = new System.Drawing.Size(362, 35);
+ this.panel5.TabIndex = 4;
+ //
+ // chk_RemoveBrit
+ //
+ this.chk_RemoveBrit.AutoSize = true;
+ this.chk_RemoveBrit.Location = new System.Drawing.Point(122, 9);
+ this.chk_RemoveBrit.Name = "chk_RemoveBrit";
+ this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16);
+ this.chk_RemoveBrit.TabIndex = 3;
+ this.chk_RemoveBrit.Text = "괄호안의 문자 제거";
+ this.chk_RemoveBrit.UseVisualStyleBackColor = true;
+ //
+ // chk_spChar
+ //
+ this.chk_spChar.AutoSize = true;
+ this.chk_spChar.Location = new System.Drawing.Point(10, 9);
+ this.chk_spChar.Name = "chk_spChar";
+ this.chk_spChar.Size = new System.Drawing.Size(100, 16);
+ this.chk_spChar.TabIndex = 4;
+ this.chk_spChar.Text = "특수문자 제거";
+ this.chk_spChar.UseVisualStyleBackColor = true;
+ //
+ // btn_ApplyFilter
+ //
+ this.btn_ApplyFilter.Location = new System.Drawing.Point(278, 5);
+ this.btn_ApplyFilter.Name = "btn_ApplyFilter";
+ this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24);
+ this.btn_ApplyFilter.TabIndex = 5;
+ this.btn_ApplyFilter.Text = "필터적용";
+ this.btn_ApplyFilter.UseVisualStyleBackColor = true;
+ //
+ // panel3
+ //
+ this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel3.Controls.Add(this.btn_Reflesh008);
+ this.panel3.Controls.Add(this.label2);
+ this.panel3.Controls.Add(this.rBtn_ISBN);
+ this.panel3.Controls.Add(this.btn_Search);
+ this.panel3.Controls.Add(this.rBtn_BookName);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel3.Location = new System.Drawing.Point(0, 35);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(362, 35);
+ this.panel3.TabIndex = 4;
+ //
+ // btn_Reflesh008
+ //
+ this.btn_Reflesh008.BackColor = System.Drawing.SystemColors.WindowText;
+ this.btn_Reflesh008.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Reflesh008.BackgroundImage")));
+ this.btn_Reflesh008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.btn_Reflesh008.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btn_Reflesh008.Location = new System.Drawing.Point(327, 0);
+ this.btn_Reflesh008.Name = "btn_Reflesh008";
+ this.btn_Reflesh008.Size = new System.Drawing.Size(33, 33);
+ this.btn_Reflesh008.TabIndex = 208;
+ this.btn_Reflesh008.UseVisualStyleBackColor = false;
+ this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(7, 11);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "검색조건";
+ //
+ // rBtn_ISBN
+ //
+ this.rBtn_ISBN.AutoSize = true;
+ this.rBtn_ISBN.Checked = true;
+ this.rBtn_ISBN.Location = new System.Drawing.Point(184, 9);
+ this.rBtn_ISBN.Name = "rBtn_ISBN";
+ this.rBtn_ISBN.Size = new System.Drawing.Size(51, 16);
+ this.rBtn_ISBN.TabIndex = 4;
+ this.rBtn_ISBN.TabStop = true;
+ this.rBtn_ISBN.Text = "ISBN";
+ this.rBtn_ISBN.UseVisualStyleBackColor = true;
+ //
+ // btn_Search
+ //
+ this.btn_Search.Location = new System.Drawing.Point(241, 6);
+ this.btn_Search.Name = "btn_Search";
+ this.btn_Search.Size = new System.Drawing.Size(75, 23);
+ this.btn_Search.TabIndex = 2;
+ this.btn_Search.Text = "검 색";
+ this.btn_Search.UseVisualStyleBackColor = true;
+ this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click);
+ //
+ // rBtn_BookName
+ //
+ this.rBtn_BookName.AutoSize = true;
+ this.rBtn_BookName.Location = new System.Drawing.Point(97, 9);
+ this.rBtn_BookName.Name = "rBtn_BookName";
+ this.rBtn_BookName.Size = new System.Drawing.Size(59, 16);
+ this.rBtn_BookName.TabIndex = 4;
+ this.rBtn_BookName.Text = "도서명";
+ this.rBtn_BookName.UseVisualStyleBackColor = true;
+ //
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel2.Controls.Add(this.btn_Connect);
- this.panel2.Controls.Add(this.panel5);
this.panel2.Controls.Add(this.lbl_PW);
this.panel2.Controls.Add(this.lbl_Area);
this.panel2.Controls.Add(this.lbl_ID);
@@ -145,76 +259,18 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(362, 70);
+ this.panel2.Size = new System.Drawing.Size(362, 35);
this.panel2.TabIndex = 3;
//
- // panel5
+ // btn_Connect
//
- this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel5.Controls.Add(this.btn_Reflesh008);
- this.panel5.Controls.Add(this.rBtn_ISBN);
- this.panel5.Controls.Add(this.rBtn_BookName);
- this.panel5.Controls.Add(this.label2);
- this.panel5.Controls.Add(this.btn_Search);
- this.panel5.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel5.Location = new System.Drawing.Point(0, 37);
- this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(360, 31);
- this.panel5.TabIndex = 4;
- //
- // btn_Reflesh008
- //
- this.btn_Reflesh008.BackColor = System.Drawing.SystemColors.WindowText;
- this.btn_Reflesh008.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_Reflesh008.BackgroundImage")));
- this.btn_Reflesh008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.btn_Reflesh008.Dock = System.Windows.Forms.DockStyle.Right;
- this.btn_Reflesh008.Location = new System.Drawing.Point(329, 0);
- this.btn_Reflesh008.Name = "btn_Reflesh008";
- this.btn_Reflesh008.Size = new System.Drawing.Size(29, 29);
- this.btn_Reflesh008.TabIndex = 208;
- this.btn_Reflesh008.UseVisualStyleBackColor = false;
- this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click);
- //
- // rBtn_ISBN
- //
- this.rBtn_ISBN.AutoSize = true;
- this.rBtn_ISBN.Checked = true;
- this.rBtn_ISBN.Location = new System.Drawing.Point(185, 7);
- this.rBtn_ISBN.Name = "rBtn_ISBN";
- this.rBtn_ISBN.Size = new System.Drawing.Size(51, 16);
- this.rBtn_ISBN.TabIndex = 4;
- this.rBtn_ISBN.TabStop = true;
- this.rBtn_ISBN.Text = "ISBN";
- this.rBtn_ISBN.UseVisualStyleBackColor = true;
- //
- // rBtn_BookName
- //
- this.rBtn_BookName.AutoSize = true;
- this.rBtn_BookName.Location = new System.Drawing.Point(98, 7);
- this.rBtn_BookName.Name = "rBtn_BookName";
- this.rBtn_BookName.Size = new System.Drawing.Size(59, 16);
- this.rBtn_BookName.TabIndex = 4;
- this.rBtn_BookName.Text = "도서명";
- this.rBtn_BookName.UseVisualStyleBackColor = true;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(6, 9);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(53, 12);
- this.label2.TabIndex = 3;
- this.label2.Text = "검색조건";
- //
- // btn_Search
- //
- this.btn_Search.Location = new System.Drawing.Point(242, 4);
- this.btn_Search.Name = "btn_Search";
- this.btn_Search.Size = new System.Drawing.Size(75, 23);
- this.btn_Search.TabIndex = 2;
- this.btn_Search.Text = "검 색";
- this.btn_Search.UseVisualStyleBackColor = true;
- this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click);
+ this.btn_Connect.Location = new System.Drawing.Point(278, 5);
+ this.btn_Connect.Name = "btn_Connect";
+ this.btn_Connect.Size = new System.Drawing.Size(75, 23);
+ this.btn_Connect.TabIndex = 5;
+ this.btn_Connect.Text = "접 속";
+ this.btn_Connect.UseVisualStyleBackColor = true;
+ this.btn_Connect.Click += new System.EventHandler(this.btn_Connect_Click);
//
// lbl_PW
//
@@ -254,7 +310,7 @@
//
// tb_SearchClient
//
- this.tb_SearchClient.Location = new System.Drawing.Point(65, 9);
+ this.tb_SearchClient.Location = new System.Drawing.Point(65, 6);
this.tb_SearchClient.Name = "tb_SearchClient";
this.tb_SearchClient.Size = new System.Drawing.Size(198, 21);
this.tb_SearchClient.TabIndex = 1;
@@ -262,7 +318,7 @@
//
// btn_Close
//
- this.btn_Close.Location = new System.Drawing.Point(820, 8);
+ this.btn_Close.Location = new System.Drawing.Point(820, 5);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(75, 23);
this.btn_Close.TabIndex = 2;
@@ -270,17 +326,6 @@
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
- // webBrowser1
- //
- this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.webBrowser1.Location = new System.Drawing.Point(0, 0);
- this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
- this.webBrowser1.Name = "webBrowser1";
- this.webBrowser1.ScriptErrorsSuppressed = true;
- this.webBrowser1.Size = new System.Drawing.Size(962, 694);
- this.webBrowser1.TabIndex = 5;
- this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
- //
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -296,13 +341,25 @@
//
this.panel7.Controls.Add(this.webBrowser1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel7.Location = new System.Drawing.Point(0, 38);
+ this.panel7.Location = new System.Drawing.Point(0, 35);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(962, 694);
+ this.panel7.Size = new System.Drawing.Size(962, 697);
this.panel7.TabIndex = 7;
//
+ // webBrowser1
+ //
+ this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webBrowser1.Location = new System.Drawing.Point(0, 0);
+ this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
+ this.webBrowser1.Name = "webBrowser1";
+ this.webBrowser1.ScriptErrorsSuppressed = true;
+ this.webBrowser1.Size = new System.Drawing.Size(962, 697);
+ this.webBrowser1.TabIndex = 5;
+ this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
+ //
// panel6
//
+ this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel6.Controls.Add(this.btn_Back);
this.panel6.Controls.Add(this.btn_Forward);
this.panel6.Controls.Add(this.tb_URL);
@@ -310,13 +367,13 @@
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
this.panel6.Location = new System.Drawing.Point(0, 0);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(962, 38);
+ this.panel6.Size = new System.Drawing.Size(962, 35);
this.panel6.TabIndex = 6;
//
// btn_Back
//
this.btn_Back.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Back.Location = new System.Drawing.Point(10, 8);
+ this.btn_Back.Location = new System.Drawing.Point(10, 5);
this.btn_Back.Name = "btn_Back";
this.btn_Back.Size = new System.Drawing.Size(43, 23);
this.btn_Back.TabIndex = 1;
@@ -327,7 +384,7 @@
// btn_Forward
//
this.btn_Forward.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Forward.Location = new System.Drawing.Point(59, 8);
+ this.btn_Forward.Location = new System.Drawing.Point(59, 5);
this.btn_Forward.Name = "btn_Forward";
this.btn_Forward.Size = new System.Drawing.Size(43, 23);
this.btn_Forward.TabIndex = 1;
@@ -337,22 +394,12 @@
//
// tb_URL
//
- this.tb_URL.Location = new System.Drawing.Point(108, 9);
+ this.tb_URL.Location = new System.Drawing.Point(108, 6);
this.tb_URL.Name = "tb_URL";
this.tb_URL.Size = new System.Drawing.Size(706, 21);
this.tb_URL.TabIndex = 0;
this.tb_URL.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_URL_KeyDown);
//
- // btn_Connect
- //
- this.btn_Connect.Location = new System.Drawing.Point(278, 8);
- this.btn_Connect.Name = "btn_Connect";
- this.btn_Connect.Size = new System.Drawing.Size(75, 23);
- this.btn_Connect.TabIndex = 5;
- this.btn_Connect.Text = "접 속";
- this.btn_Connect.UseVisualStyleBackColor = true;
- this.btn_Connect.Click += new System.EventHandler(this.btn_Connect_Click);
- //
// DLS_Copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -364,12 +411,14 @@
this.Text = "DLS 복본조사";
this.Load += new System.EventHandler(this.DLS_Copy_Load);
this.panel1.ResumeLayout(false);
- this.panel3.ResumeLayout(false);
+ this.panel8.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
- this.panel2.ResumeLayout(false);
- this.panel2.PerformLayout();
this.panel5.ResumeLayout(false);
this.panel5.PerformLayout();
+ this.panel3.ResumeLayout(false);
+ this.panel3.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
this.panel4.ResumeLayout(false);
this.panel7.ResumeLayout(false);
this.panel6.ResumeLayout(false);
@@ -408,5 +457,9 @@
private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Button btn_Reflesh008;
private System.Windows.Forms.Button btn_Connect;
+ private System.Windows.Forms.CheckBox chk_RemoveBrit;
+ private System.Windows.Forms.Button btn_ApplyFilter;
+ private System.Windows.Forms.CheckBox chk_spChar;
+ private System.Windows.Forms.Panel panel8;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs
index d4fa227..950a31d 100644
--- a/unimarc/unimarc/마크/Marc.cs
+++ b/unimarc/unimarc/마크/Marc.cs
@@ -17,7 +17,7 @@ namespace ExcelTest
/// isbn / 도서명 / 저자 / 출판사 / 가격
///
string[] data_book = { "", "", "", "", "" };
- string user_name;
+ public string user_name;
string compidx;
public string find;
public string change;
@@ -78,7 +78,6 @@ namespace ExcelTest
comboBox7.SelectedIndex = 0;
comboBox8.SelectedIndex = 0;
-
#endregion
compidx = UniMarc.Properties.Settings.Default.compidx;
}
@@ -1034,6 +1033,9 @@ namespace ExcelTest
{
string Result = "";
+ ContentTag = ContentTag.Replace("[", "");
+ ContentTag = ContentTag.Replace("]", "");
+
// string cmd = db.DB_Select_Search("`Code`", "Tag008_Country", "Area", ContentTag);
string cmd = string.Format(
"SELECT `Code` FROM `Tag008_Country` WHERE `Area` <= \"{0}\" ORDER BY `Area` DESC LIMIT 1;", ContentTag);
@@ -1168,8 +1170,11 @@ namespace ExcelTest
private void pictureBox1_DoubleClick(object sender, EventArgs e)
{
+ int row = List_Book.CurrentCell.RowIndex;
+
Zoom_Picture zp = new Zoom_Picture();
zp.url = pictureBox1.ImageLocation;
+ zp.ISBN = List_Book.Rows[row].Cells["ISBN13"].Value.ToString();
zp.Show();
}
@@ -1968,7 +1973,7 @@ namespace ExcelTest
"490", "500", "504", "505", "507",
"520", "521", "525", "536", "546",
"586", "650", "653", "700", "710",
- "900", "910", "940"
+ "900", "910", "940", "100", "110", "111"
};
List RemainTag = new List();
@@ -2028,15 +2033,17 @@ namespace ExcelTest
foreach (string Data in aryText)
{
- string[] grid = { count.ToString() };
+ string[] grid = { "", "", "" };
string[] dataAry = Data.Split('\t');
if (dataAry.Length < 2) continue;
+ int AryCount = 0;
foreach (string tt in dataAry)
{
- Array.Resize(ref grid, grid.Length + 1);
- grid[grid.Length - 1] = tt;
+ if (grid.Length <= AryCount) break;
+ grid[AryCount] = tt;
+ AryCount++;
}
dataGridView1.Rows.Add(grid);
@@ -2047,21 +2054,13 @@ namespace ExcelTest
dataGridView1.Sort(dataGridView1.Columns["tag"], System.ComponentModel.ListSortDirection.Ascending);
- bool isAuthor = false;
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
string tag = dataGridView1.Rows[a].Cells["tag"].Value.ToString();
string jisi = dataGridView1.Rows[a].Cells["jisi"].Value.ToString();
string marc = dataGridView1.Rows[a].Cells["MarcValue"].Value.ToString();
- if (tag != "100")
- isAuthor = false;
-
- if (!isAuthor)
- richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", tag, jisi, marc);
-
- if (tag == "100")
- isAuthor = true;
+ richTextBox1.Text += string.Format("{0}\t{1}\t{2}\n", tag, jisi, marc);
}
}
@@ -2119,9 +2118,7 @@ namespace ExcelTest
LineMarc.Add(GridMarc(TagNum));
if (isText)
- {
LineMarc.Add(TextMarc(TagNum));
- }
}
return LineMarc;
@@ -2506,11 +2503,11 @@ namespace ExcelTest
return "";
if (boxText[0] != "")
- result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[0], "4");
+ result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[0], "21");
if (boxText[1] != "")
- result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[1], "5");
+ result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[1], "22");
if (boxText[2] != "")
- result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[2], "6");
+ result += string.Format("082\t \t▼a{0}▼2{1}▲", boxText[2], "23");
return result;
}
@@ -2530,13 +2527,14 @@ namespace ExcelTest
string result = "";
- if (TagNum == "100" && rbtn_100.Checked)
- result = string.Format("{0}\t \t▼a{1}", TagNum, boxText);
- if (TagNum == "110" && rbtn_110.Checked)
- result = string.Format("{0}\t \t▼a{1}", TagNum, boxText);
- if (TagNum == "111" && rbtn_111.Checked)
- result = string.Format("{0}\t \t▼a{1}", TagNum, boxText);
+ string[] splitText = boxText.Split('▽');
+ if (TagNum == "100" && rbtn_100.Checked)
+ result = string.Format("{0}\t \t▼a{1}", TagNum, splitText[0]);
+ if (TagNum == "110" && rbtn_110.Checked)
+ result = string.Format("{0}\t \t▼a{1}", TagNum, splitText[0]);
+ if (TagNum == "111" && rbtn_111.Checked)
+ result = string.Format("{0}\t \t▼a{1}", TagNum, splitText[0]);
result += "▲";
@@ -2909,7 +2907,7 @@ namespace ExcelTest
foreach (string text in splitText)
{
- result += string.Format("900\t \t▼a{0}▲", text);
+ result += string.Format("900\t \t▼a{0}▲\n", text);
}
return result;
diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs
index 720631b..54121a8 100644
--- a/unimarc/unimarc/마크/Marc.designer.cs
+++ b/unimarc/unimarc/마크/Marc.designer.cs
@@ -28,17 +28,17 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.etc1 = new System.Windows.Forms.RichTextBox();
this.etc2 = new System.Windows.Forms.RichTextBox();
@@ -244,7 +244,6 @@
this.text507a = new System.Windows.Forms.TextBox();
this.text250a = new System.Windows.Forms.TextBox();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.jisi = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MarcValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -551,14 +550,14 @@
this.List_Book.AllowUserToAddRows = false;
this.List_Book.AllowUserToDeleteRows = false;
this.List_Book.AllowUserToResizeColumns = false;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_idx,
this.ISBN13,
@@ -683,8 +682,8 @@
//
// colCheck
//
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colCheck.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colCheck.DefaultCellStyle = dataGridViewCellStyle12;
this.colCheck.HeaderText = "V";
this.colCheck.Name = "colCheck";
this.colCheck.ReadOnly = true;
@@ -1061,8 +1060,8 @@
this.GridView020.Name = "GridView020";
this.GridView020.RowHeadersVisible = false;
this.GridView020.RowHeadersWidth = 30;
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle13;
this.GridView020.RowTemplate.Height = 23;
this.GridView020.Size = new System.Drawing.Size(408, 80);
this.GridView020.TabIndex = 244;
@@ -1128,8 +1127,8 @@
this.GridView505.Name = "GridView505";
this.GridView505.RowHeadersVisible = false;
this.GridView505.RowHeadersWidth = 30;
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle14;
this.GridView505.RowTemplate.Height = 23;
this.GridView505.Size = new System.Drawing.Size(401, 71);
this.GridView505.TabIndex = 246;
@@ -1260,14 +1259,14 @@
this.GridView246.AllowDrop = true;
this.GridView246.AllowUserToAddRows = false;
this.GridView246.AllowUserToResizeRows = false;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Text246Jisi,
this.Text246i,
@@ -1279,8 +1278,8 @@
this.GridView246.Name = "GridView246";
this.GridView246.RowHeadersVisible = false;
this.GridView246.RowHeadersWidth = 30;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle16;
this.GridView246.RowTemplate.Height = 23;
this.GridView246.Size = new System.Drawing.Size(493, 138);
this.GridView246.TabIndex = 250;
@@ -1427,14 +1426,14 @@
this.GridView440.AllowDrop = true;
this.GridView440.AllowUserToAddRows = false;
this.GridView440.AllowUserToResizeRows = false;
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle17.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.text440a,
@@ -1447,8 +1446,8 @@
this.GridView440.Name = "GridView440";
this.GridView440.RowHeadersVisible = false;
this.GridView440.RowHeadersWidth = 30;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle18;
this.GridView440.RowTemplate.Height = 23;
this.GridView440.Size = new System.Drawing.Size(597, 71);
this.GridView440.TabIndex = 245;
@@ -1544,14 +1543,14 @@
this.GridView490.AllowDrop = true;
this.GridView490.AllowUserToAddRows = false;
this.GridView490.AllowUserToResizeRows = false;
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle19.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.text490a,
@@ -1560,8 +1559,8 @@
this.GridView490.Name = "GridView490";
this.GridView490.RowHeadersVisible = false;
this.GridView490.RowHeadersWidth = 30;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle20;
this.GridView490.RowTemplate.Height = 23;
this.GridView490.Size = new System.Drawing.Size(321, 71);
this.GridView490.TabIndex = 247;
@@ -2422,23 +2421,15 @@
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.dataGridViewTextBoxColumn1,
this.tag,
this.jisi,
this.MarcValue});
- this.dataGridView1.Location = new System.Drawing.Point(1461, 731);
+ this.dataGridView1.Location = new System.Drawing.Point(1466, 731);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(310, 79);
+ this.dataGridView1.Size = new System.Drawing.Size(287, 79);
this.dataGridView1.TabIndex = 317;
- this.dataGridView1.Visible = false;
- //
- // dataGridViewTextBoxColumn1
- //
- this.dataGridViewTextBoxColumn1.HeaderText = "num";
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- this.dataGridViewTextBoxColumn1.Width = 40;
//
// tag
//
@@ -2773,10 +2764,6 @@
private System.Windows.Forms.TextBox text507a;
private System.Windows.Forms.TextBox text250a;
private System.Windows.Forms.DataGridView dataGridView1;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
- private System.Windows.Forms.DataGridViewTextBoxColumn tag;
- private System.Windows.Forms.DataGridViewTextBoxColumn jisi;
- private System.Windows.Forms.DataGridViewTextBoxColumn MarcValue;
private System.Windows.Forms.DataGridViewCheckBoxColumn CheckSet;
private System.Windows.Forms.DataGridViewTextBoxColumn Text020a;
private System.Windows.Forms.DataGridViewTextBoxColumn Text020g;
@@ -2800,5 +2787,8 @@
private System.Windows.Forms.Button Btn_interlock;
private System.Windows.Forms.Label lbl_ISBN;
private System.Windows.Forms.Label lbl_BookList;
+ private System.Windows.Forms.DataGridViewTextBoxColumn tag;
+ private System.Windows.Forms.DataGridViewTextBoxColumn jisi;
+ private System.Windows.Forms.DataGridViewTextBoxColumn MarcValue;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx
index 76fcdb4..d8510f9 100644
--- a/unimarc/unimarc/마크/Marc.resx
+++ b/unimarc/unimarc/마크/Marc.resx
@@ -267,9 +267,6 @@
True
-
- True
-
True
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index 1c34538..01e1e31 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -46,6 +46,11 @@ namespace WindowsFormsApp1.Mac
sub.TopMost = true;
sub.Show();
}
+
+ private void Btn_Search_Click(object sender, EventArgs e)
+ {
+ throw new NotImplementedException();
+ }
#region SelectList_Sub
public void mk_Grid(string ListName, string date)
{
@@ -144,12 +149,14 @@ namespace WindowsFormsApp1.Mac
int row = e.RowIndex;
int col = e.ColumnIndex;
+ string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString();
+
if (dataGridView1.Rows[row].Cells[col].ReadOnly) {
string[] Marc = {
dataGridView1.Rows[row].Cells["marc"].Value.ToString(),
dataGridView1.Rows[row].Cells["midx"].Value.ToString(),
dataGridView1.Rows[row].Cells["num"].Value.ToString(),
- dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
+ idx,
dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
string[] symbol_Type = {
@@ -159,7 +166,9 @@ namespace WindowsFormsApp1.Mac
Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this);
me.row = row;
- me.Init(Marc, symbol_Type);
+ me.UserName = main.botUserLabel.Text;
+ me.Init(Marc);
+ me.SetSymbolType(symbol_Type);
me.Show();
}
}
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
index 0954179..b268979 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.Designer.cs
@@ -85,6 +85,7 @@ namespace UniMarc.마크
this.label9 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
+ this.lbl_SaveData = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.panel5.SuspendLayout();
this.panel6.SuspendLayout();
@@ -97,6 +98,7 @@ namespace UniMarc.마크
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.lbl_SaveData);
this.panel1.Controls.Add(this.lbl_ClassSymbol);
this.panel1.Controls.Add(this.lbl_AuthorSymbol);
this.panel1.Controls.Add(this.btn_Close);
@@ -403,7 +405,7 @@ namespace UniMarc.마크
// btn_Save
//
this.btn_Save.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Save.Location = new System.Drawing.Point(799, 155);
+ this.btn_Save.Location = new System.Drawing.Point(799, 156);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(115, 51);
this.btn_Save.TabIndex = 4;
@@ -682,6 +684,17 @@ namespace UniMarc.마크
this.label4.TabIndex = 206;
this.label4.Text = "008";
//
+ // lbl_SaveData
+ //
+ this.lbl_SaveData.AutoSize = true;
+ this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbl_SaveData.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.lbl_SaveData.Location = new System.Drawing.Point(188, 156);
+ this.lbl_SaveData.Name = "lbl_SaveData";
+ this.lbl_SaveData.Size = new System.Drawing.Size(64, 19);
+ this.lbl_SaveData.TabIndex = 319;
+ this.lbl_SaveData.Text = "[] []";
+ //
// Marc_Plan_Sub_MarcEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -757,7 +770,6 @@ namespace UniMarc.마크
private System.Windows.Forms.Panel panel6;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Button btn_EditNum;
private System.Windows.Forms.TextBox tb_num;
private System.Windows.Forms.TextBox tb_Mcode;
private System.Windows.Forms.TextBox text001;
@@ -767,5 +779,7 @@ namespace UniMarc.마크
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label lbl_ClassSymbol;
private System.Windows.Forms.Label lbl_AuthorSymbol;
+ public System.Windows.Forms.Button btn_EditNum;
+ private System.Windows.Forms.Label lbl_SaveData;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
index ed1b05f..eff6884 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit.cs
@@ -17,9 +17,11 @@ namespace UniMarc.마크
{
string idx;
public int row;
+ public string UserName = "";
Marc_Plan mp;
Helper_DB db = new Helper_DB();
String_Text st = new String_Text();
+ Search_Infor si;
Help008Tag tag008 = new Help008Tag();
public Marc_Plan_Sub_MarcEdit(Marc_Plan _mp)
{
@@ -27,38 +29,19 @@ namespace UniMarc.마크
mp = _mp;
db.DBcon();
}
+ public Marc_Plan_Sub_MarcEdit(Search_Infor _si)
+ {
+ InitializeComponent();
+ si = _si;
+ db.DBcon();
+ }
///
/// 시작전 세팅작업. 필요한 데이터들을 각각의 박스들에 집어넣음.
///
/// 0:Marc 1:MarcIdx 2:연번 3:idx 4:ISBN
- /// 저자기호 배열
- /// 0:FirstAuthor 1:authorType 2:FirstBook 3:divType 4:divNum
- public void Init(string[] Marc, string[] Symbol_Type)
+ public void Init(string[] Marc)
{
- #region 저자기호
- AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
-
- cb_FirstAuthor.Items.AddRange(sb.authorBook);
- cb_authorType.Items.AddRange(sb.authorType);
- cb_FirstBook.Items.AddRange(sb.authorFirst);
-
- cb_FirstAuthor.SelectedItem = Symbol_Type[0];
- cb_authorType.SelectedItem = Symbol_Type[1];
- cb_FirstBook.SelectedItem = Symbol_Type[2];
- #endregion
-
- #region 분류기호
- string[] divType = { "KDC", "DDC" };
- cb_divType.Items.AddRange(divType);
-
- string[] divNum = { "4", "5", "6" };
- cb_divNum.Items.AddRange(divNum);
-
- cb_divType.SelectedItem = Symbol_Type[3];
- cb_divNum.SelectedItem = Symbol_Type[4];
- #endregion
-
// 이용자 9
comboBox1.Items.AddRange(tag008.combo1);
@@ -86,9 +69,66 @@ namespace UniMarc.마크
tb_Mcode.Text = Marc[1];
tb_num.Text = Marc[2];
idx = Marc[3];
+
input_picture(Marc[4]);
+ SetEditData();
}
+
+ public void SetEditData()
+ {
+ if (mp != null)
+ {
+ string cmd = string.Format("SELECT `user`, `editDate` FROM `Specs_Marc` WHERE `idx` = \"{0}\"", idx);
+ string res = db.DB_Send_CMD_Search(cmd);
+ string[] aryResultData = res.Split('|');
+
+ if (aryResultData.Length > 1)
+ lbl_SaveData.Text = string.Format("[{0}] [{1}]", aryResultData[0], aryResultData[1]);
+ }
+ else if (si != null)
+ {
+ string cmd = string.Format("SELECT `user`, `date` FROM `Marc` WHERE `idx` = \"{0}\"", tb_Mcode.Text);
+ string res = db.DB_Send_CMD_Search(cmd);
+ string[] aryResultData = res.Split('|');
+
+ if (aryResultData.Length > 1)
+ lbl_SaveData.Text = string.Format("[{0}] [{1}]", aryResultData[0], aryResultData[1]);
+ }
+
+ }
+
+ ///
+ /// 시작전 저자기호 세팅작업. 필요한 데이터들을 각각의 박스들에 집어넣음.
+ ///
+ /// 저자기호 배열
+ /// 0:FirstAuthor 1:authorType 2:FirstBook 3:divType 4:divNum
+ public void SetSymbolType(string[] Symbol_Type)
+ {
+ #region 저자기호
+ AuthorSymbol.Symbol sb = new AuthorSymbol.Symbol();
+
+ cb_FirstAuthor.Items.AddRange(sb.authorBook);
+ cb_authorType.Items.AddRange(sb.authorType);
+ cb_FirstBook.Items.AddRange(sb.authorFirst);
+
+ cb_FirstAuthor.SelectedItem = Symbol_Type[0];
+ cb_authorType.SelectedItem = Symbol_Type[1];
+ cb_FirstBook.SelectedItem = Symbol_Type[2];
+ #endregion
+
+ #region 분류기호
+ string[] divType = { "KDC", "DDC" };
+ cb_divType.Items.AddRange(divType);
+
+ string[] divNum = { "4", "5", "6" };
+ cb_divNum.Items.AddRange(divNum);
+
+ cb_divType.SelectedItem = Symbol_Type[3];
+ cb_divNum.SelectedItem = Symbol_Type[4];
+ #endregion
+ }
+
#region Init_Sub
void input_picture(string isbn)
{
@@ -339,6 +379,16 @@ namespace UniMarc.마크
{
string oriMarc = st.made_Ori_marc(richTextBox1);
+ if (mp != null)
+ Save_mp(oriMarc);
+
+ if (si != null)
+ Save_si(oriMarc);
+ }
+ #region Save_Sub
+
+ private void Save_mp(string oriMarc)
+ {
// 등록번호 분류기호 저자기호 볼륨 복본
// 별치 총서명 총서번호 저자 출판사
// 정가 ISBN
@@ -380,7 +430,69 @@ namespace UniMarc.마크
mp.dataGridView1.Rows[row].Cells["book_name"].Value = BookName;
mp.dataGridView1.Rows[row].Cells["marc"].Value = oriMarc;
}
- #region Save_Sub
+
+ private void Save_si(string oriMarc)
+ {
+ string today = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string user = UserName;
+ string MarcIndex = tb_Mcode.Text;
+ string Table = "Marc";
+
+ string[] Search_Col = { "idx" };
+ string[] Search_data = { MarcIndex };
+
+ string[] Update_Col = { "marc", "marc_chk", "marc_chk2", "date", "user" };
+ string[] Update_data = { oriMarc, "1", "0", today, user };
+
+ string res = Sub_marc_chk(MarcIndex);
+ switch (res)
+ {
+ case "0":
+ Update_Col[0] = "marc1";
+ Update_Col[1] = "marc_chk1";
+ Update_Col[2] = "marc_chk";
+ break;
+ case "1":
+ Update_Col[0] = "marc2";
+ Update_Col[1] = "marc_chk2";
+ Update_Col[2] = "marc_chk1";
+ break;
+ case "2":
+ Update_Col[0] = "marc";
+ Update_Col[1] = "marc_chk";
+ Update_Col[2] = "marc_chk2";
+ break;
+ default:
+ break;
+ }
+
+ string Ucmd = db.More_Update(Table, Update_Col, Update_data, Search_Col, Search_data);
+ db.DB_Send_CMD_reVoid(Ucmd);
+
+ MessageBox.Show("저장되었습니다!");
+
+ si.dataGridView1.Rows[row].Cells["Marc"].Value = oriMarc;
+ si.dataGridView1.Rows[row].Cells["User"].Value = user;
+ si.dataGridView1.Rows[row].Cells["date"].Value = today;
+ }
+
+ private string Sub_marc_chk(string idx)
+ {
+ string Area = "`marc_chk`, `marc_chk1`, `marc_chk2`";
+ string cmd = db.DB_Select_Search(Area, "Marc", "idx", idx);
+ string db_res = db.DB_Send_CMD_Search(cmd);
+ string[] chk_ary = db_res.Split('|');
+
+ for (int a = 0; a < chk_ary.Length; a++)
+ {
+ if (chk_ary[a] == "1")
+ {
+ return a.ToString();
+ }
+ }
+ return "0";
+ }
+
///
/// 추출해낸 태그값을 Grid에 적용
///
@@ -447,7 +559,12 @@ namespace UniMarc.마크
private void btn_Front_Click(object sender, EventArgs e)
{
- int mprow = mp.dataGridView1.Rows.Count;
+ int mprow = 0;
+ if (mp != null)
+ mprow = mp.dataGridView1.Rows.Count;
+ else if(si!=null)
+ mprow = si.dataGridView1.Rows.Count;
+
if (row < mprow - 1)
row++;
else
@@ -458,19 +575,43 @@ namespace UniMarc.마크
#region btn_FrontAndBack_Sub
private void Btn_FrontAndBack_Sub()
{
- mp.dataGridView1.Rows[row].Selected = true;
+ if (mp != null)
+ FrontBack_mp();
+
+ else if (si != null)
+ FrontBack_si();
+ }
+
+ private void FrontBack_mp()
+ {
string[] marc = {
mp.dataGridView1.Rows[row].Cells["marc"].Value.ToString(),
mp.dataGridView1.Rows[row].Cells["midx"].Value.ToString(),
mp.dataGridView1.Rows[row].Cells["num"].Value.ToString(),
- mp.dataGridView1.Rows[row].Cells["idx"].Value.ToString()
+ mp.dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
+ mp.dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
};
string[] Symbol_Type = {
cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text
};
- Init(marc, Symbol_Type);
+ Init(marc);
+ SetSymbolType(Symbol_Type);
}
+
+ private void FrontBack_si()
+ {
+ string[] Marc = {
+ si.dataGridView1.Rows[row].Cells["Marc"].Value.ToString(),
+ si.dataGridView1.Rows[row].Cells["idx"].Value.ToString(),
+ "",
+ "",
+ si.dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
+ };
+
+ Init(Marc);
+ }
+
#endregion
private void Marc_Plan_Sub_MarcEdit_Load(object sender, EventArgs e)
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
index 67e357a..c22c28e 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
@@ -246,7 +246,6 @@ namespace UniMarc.마크
private System.Windows.Forms.TextBox tb_Search;
private System.Windows.Forms.ComboBox cb_gu;
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Button btn_Search;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btn_Complite;
private System.Windows.Forms.Button btn_Progress;
@@ -258,5 +257,6 @@ namespace UniMarc.마크
private System.Windows.Forms.DataGridViewTextBoxColumn list_name;
private System.Windows.Forms.DataGridViewTextBoxColumn date;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+ public System.Windows.Forms.Button btn_Search;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
index a315d46..8559ee7 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
@@ -34,6 +34,8 @@ namespace UniMarc.마크
dataGridView1.Columns["list_name"].ReadOnly = true;
dataGridView1.Columns["date"].ReadOnly = true;
+
+ // btn_Search_Click(null, e);
}
private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
@@ -52,7 +54,7 @@ namespace UniMarc.마크
((TextBox)sender).BackColor = Color.White;
}
- private void btn_Search_Click(object sender, EventArgs e)
+ public void btn_Search_Click(object sender, EventArgs e)
{
dataGridView1.Rows.Clear();
@@ -155,10 +157,12 @@ namespace UniMarc.마크
if (cb_gu.SelectedIndex == 0) {
btn_Progress.Enabled = false;
btn_Complite.Enabled = true;
+ btn_Search_Click(null, e);
}
else {
btn_Complite.Enabled = false;
btn_Progress.Enabled = true;
+ btn_Search_Click(null, e);
}
}
diff --git a/unimarc/unimarc/마크/Marc_mkList.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs
index 04e7b44..16a9cca 100644
--- a/unimarc/unimarc/마크/Marc_mkList.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs
@@ -120,7 +120,6 @@ namespace UniMarc.마크
this.chk_countSplit.TabIndex = 0;
this.chk_countSplit.Text = "수량분리";
this.chk_countSplit.UseVisualStyleBackColor = true;
- this.chk_countSplit.Click += new System.EventHandler(this.chk_countSplit_Click);
//
// btn_mkList
//
diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs
index b742e54..6a62df3 100644
--- a/unimarc/unimarc/마크/Marc_mkList.cs
+++ b/unimarc/unimarc/마크/Marc_mkList.cs
@@ -98,6 +98,7 @@ namespace UniMarc.마크
string listName = tb_listName.Text;
string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
string outnum = tb_outnum.Text + "차";
+ string user = marc.user_name;
bool isAuthor = false;
bool isBook = false;
@@ -111,12 +112,12 @@ namespace UniMarc.마크
string[] insert_list_col = {
"compidx", "work_list", "date", "state", "gu",
"first_Author", "symbol_Author", "book_Author", "divType", "divNum",
- "etc"
+ "etc", "user"
};
string[] insert_list_data = {
compidx, listName, Time, "진행", cb_listType.Text,
cb_FirstAuthor.Text, cb_authorType.Text, cb_FirstBook.Text, cb_divType.Text, cb_divNum.Text,
- rtb_etc.Text
+ rtb_etc.Text, user
};
string cmdByList = db.DB_INSERT("Specs_List", insert_list_col, insert_list_data);
@@ -125,21 +126,25 @@ namespace UniMarc.마크
"compidx", "work_list", "date", "ISBN", "book_name",
"s_book_name1", "s_book_num1", "author", "book_comp", "pubdate",
"price", "tag008", "class_symbol", "author_symbol", "marc",
- "imageURL", "count", "num", "out_num", "midx"
+ "imageURL", "count", "num", "out_num", "midx",
+ "editDate", "user"
};
string[] insert_marc_data = {
compidx, listName, Time, "", "",
"", "", "", "", "",
"", "", "", "", "",
- "", "", "", "", ""
+ "", "", "", "", "",
+ Time, user
}; // 마크에서 추출 ( 3 ~ 12 )
int[] row = checkGridRow();
int num = 0;
- progressBar1.Maximum = row.Length;
+ progressBar1.Maximum = row.Length + 1;
string cmdByMarc = string.Format("INSERT INTO {0} {1}", "Specs_Marc", db.DB_INSERT_SUB("", insert_marc_col));
+ bool CountSplit = chk_countSplit.Checked;
+
// 필터링하여 DB에 집어넣는 작업
for (int a = 0; a < row.Length; a++)
{
@@ -152,6 +157,8 @@ namespace UniMarc.마크
insert_marc_data[17] = num.ToString();
insert_marc_data[18] = outnum;
insert_marc_data[19] = marc.List_Book.Rows[row[a]].Cells["marc_idx"].Value.ToString();
+ insert_marc_data[20] = marc.List_Book.Rows[row[a]].Cells["SaveDate"].Value.ToString();
+ insert_marc_data[21] = marc.List_Book.Rows[row[a]].Cells["user"].Value.ToString();
string[] Marc = st.Take_Tag(insert_marc_data[14], Search);
string[] Author = { "", Marc[1] }; // 저자, 도서명
@@ -184,16 +191,38 @@ namespace UniMarc.마크
string res_Author = sb.SymbolAuthor(Author[0], Author[1], authorType, isType);
insert_marc_data[13] = res_Author;
- if (a == row.Length - 1)
- cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ";";
+ int count = Convert.ToInt32(marc.List_Book.Rows[row[a]].Cells["count"].Value.ToString());
+
+ if (CountSplit)
+ {
+ for (int b = 1; b <= count; b++)
+ {
+ if (a == 0)
+ cmdByMarc += "value" + db.DB_INSERT_SUB("value", insert_marc_data) + ",";
+ else
+ cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ",";
+ }
+ }
else
- cmdByMarc += "value" + db.DB_INSERT_SUB("value", insert_marc_data) + ", ";
+ {
+ if (a == 0)
+ cmdByMarc += "value" + db.DB_INSERT_SUB("value", insert_marc_data) + ",";
+ else
+ cmdByMarc += db.DB_INSERT_SUB("value", insert_marc_data) + ",";
+ }
progressBar1.PerformStep();
}
+
+ cmdByMarc = cmdByMarc.TrimEnd(',');
+ cmdByMarc += ";";
+
+ MessageBox.Show(cmdByMarc);
+ db.DB_Send_CMD_reVoid(cmdByList);
+ db.DB_Send_CMD_reVoid(cmdByMarc);
+ progressBar1.PerformStep();
+
if (progressBar1.Value == progressBar1.Maximum) {
label2.Text = "완료되었습니다!";
- db.DB_Send_CMD_reVoid(cmdByList);
- db.DB_Send_CMD_reVoid(cmdByMarc);
}
}
#region mkList_Sub
@@ -220,13 +249,5 @@ namespace UniMarc.마크
this.Close();
}
- private void chk_countSplit_Click(object sender, EventArgs e)
- {
- if (chk_countSplit.Checked)
- chk_countSplit.Checked = false;
-
- else
- chk_countSplit.Checked = true;
- }
}
}
diff --git a/unimarc/unimarc/마크/Search_Infor.Designer.cs b/unimarc/unimarc/마크/Search_Infor.Designer.cs
index b3a09c1..6240bef 100644
--- a/unimarc/unimarc/마크/Search_Infor.Designer.cs
+++ b/unimarc/unimarc/마크/Search_Infor.Designer.cs
@@ -31,9 +31,13 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.User = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.sBookName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.author = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.price = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -48,13 +52,27 @@
this.btn_close = new System.Windows.Forms.Button();
this.cb_data_area = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
+ this.cb_filterDetail = new System.Windows.Forms.ComboBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel5 = new System.Windows.Forms.Panel();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.dtp_End = new System.Windows.Forms.DateTimePicker();
+ this.dtp_Start = new System.Windows.Forms.DateTimePicker();
+ this.label4 = new System.Windows.Forms.Label();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.panel5.SuspendLayout();
+ this.panel4.SuspendLayout();
+ this.panel3.SuspendLayout();
+ this.panel2.SuspendLayout();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(12, 11);
+ this.label1.Location = new System.Drawing.Point(14, 11);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 5;
@@ -74,9 +92,13 @@
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.idx,
this.grade,
+ this.User,
+ this.date,
this.ISBN,
this.book_name,
+ this.sBookName,
this.author,
this.book_comp,
this.price,
@@ -84,20 +106,37 @@
this.Marc,
this.etc1,
this.etc2});
- this.dataGridView1.Location = new System.Drawing.Point(12, 35);
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 20;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1234, 619);
+ this.dataGridView1.Size = new System.Drawing.Size(1449, 630);
this.dataGridView1.TabIndex = 49;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
//
+ // idx
+ //
+ this.idx.HeaderText = "idx";
+ this.idx.Name = "idx";
+ this.idx.Visible = false;
+ //
// grade
//
this.grade.HeaderText = "등급";
this.grade.Name = "grade";
this.grade.Width = 50;
//
+ // User
+ //
+ this.User.HeaderText = "작성자";
+ this.User.Name = "User";
+ //
+ // date
+ //
+ this.date.HeaderText = "날짜";
+ this.date.Name = "date";
+ //
// ISBN
//
this.ISBN.HeaderText = "ISBN";
@@ -109,6 +148,11 @@
this.book_name.Name = "book_name";
this.book_name.Width = 250;
//
+ // sBookName
+ //
+ this.sBookName.HeaderText = "총서명";
+ this.sBookName.Name = "sBookName";
+ //
// author
//
this.author.HeaderText = "저자";
@@ -153,7 +197,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(430, 11);
+ this.label2.Location = new System.Drawing.Point(12, 11);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.TabIndex = 5;
@@ -161,7 +205,7 @@
//
// tb_search
//
- this.tb_search.Location = new System.Drawing.Point(477, 7);
+ this.tb_search.Location = new System.Drawing.Point(55, 7);
this.tb_search.Name = "tb_search";
this.tb_search.Size = new System.Drawing.Size(222, 21);
this.tb_search.TabIndex = 6;
@@ -169,7 +213,7 @@
//
// btn_search
//
- this.btn_search.Location = new System.Drawing.Point(710, 6);
+ this.btn_search.Location = new System.Drawing.Point(288, 6);
this.btn_search.Name = "btn_search";
this.btn_search.Size = new System.Drawing.Size(75, 23);
this.btn_search.TabIndex = 7;
@@ -181,14 +225,15 @@
//
this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_filter.FormattingEnabled = true;
- this.cb_filter.Location = new System.Drawing.Point(222, 7);
+ this.cb_filter.Location = new System.Drawing.Point(11, 7);
this.cb_filter.Name = "cb_filter";
- this.cb_filter.Size = new System.Drawing.Size(161, 20);
+ this.cb_filter.Size = new System.Drawing.Size(111, 20);
this.cb_filter.TabIndex = 50;
+ this.cb_filter.SelectedIndexChanged += new System.EventHandler(this.cb_filter_SelectedIndexChanged);
//
// btn_close
//
- this.btn_close.Location = new System.Drawing.Point(798, 6);
+ this.btn_close.Location = new System.Drawing.Point(371, 6);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(75, 23);
this.btn_close.TabIndex = 51;
@@ -200,56 +245,168 @@
//
this.cb_data_area.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_data_area.FormattingEnabled = true;
- this.cb_data_area.Location = new System.Drawing.Point(71, 7);
+ this.cb_data_area.Location = new System.Drawing.Point(69, 7);
this.cb_data_area.Name = "cb_data_area";
this.cb_data_area.Size = new System.Drawing.Size(145, 20);
this.cb_data_area.TabIndex = 52;
+ this.cb_data_area.SelectedIndexChanged += new System.EventHandler(this.cb_data_area_SelectedIndexChanged);
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(898, 11);
+ this.label3.Location = new System.Drawing.Point(458, 11);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(38, 12);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 53;
- this.label3.Text = "label3";
+ this.label3.Text = "검색결과";
+ //
+ // cb_filterDetail
+ //
+ this.cb_filterDetail.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_filterDetail.FormattingEnabled = true;
+ this.cb_filterDetail.Location = new System.Drawing.Point(128, 7);
+ this.cb_filterDetail.Name = "cb_filterDetail";
+ this.cb_filterDetail.Size = new System.Drawing.Size(111, 20);
+ this.cb_filterDetail.TabIndex = 50;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.panel5);
+ this.panel1.Controls.Add(this.panel4);
+ this.panel1.Controls.Add(this.panel3);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1449, 36);
+ this.panel1.TabIndex = 54;
+ //
+ // panel5
+ //
+ this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel5.Controls.Add(this.label2);
+ this.panel5.Controls.Add(this.btn_search);
+ this.panel5.Controls.Add(this.btn_close);
+ this.panel5.Controls.Add(this.label3);
+ this.panel5.Controls.Add(this.tb_search);
+ this.panel5.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel5.Location = new System.Drawing.Point(676, 0);
+ this.panel5.Name = "panel5";
+ this.panel5.Size = new System.Drawing.Size(653, 36);
+ this.panel5.TabIndex = 56;
+ //
+ // panel4
+ //
+ this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel4.Controls.Add(this.dtp_End);
+ this.panel4.Controls.Add(this.dtp_Start);
+ this.panel4.Controls.Add(this.cb_filterDetail);
+ this.panel4.Controls.Add(this.label4);
+ this.panel4.Controls.Add(this.cb_filter);
+ this.panel4.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel4.Location = new System.Drawing.Point(229, 0);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(447, 36);
+ this.panel4.TabIndex = 55;
+ //
+ // dtp_End
+ //
+ this.dtp_End.CustomFormat = "yyyy-MM-dd";
+ this.dtp_End.Enabled = false;
+ this.dtp_End.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtp_End.Location = new System.Drawing.Point(354, 7);
+ this.dtp_End.Name = "dtp_End";
+ this.dtp_End.Size = new System.Drawing.Size(82, 21);
+ this.dtp_End.TabIndex = 51;
+ //
+ // dtp_Start
+ //
+ this.dtp_Start.CustomFormat = "yyyy-MM-01";
+ this.dtp_Start.Enabled = false;
+ this.dtp_Start.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtp_Start.Location = new System.Drawing.Point(254, 7);
+ this.dtp_Start.Name = "dtp_Start";
+ this.dtp_Start.Size = new System.Drawing.Size(82, 21);
+ this.dtp_Start.TabIndex = 51;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.label4.Location = new System.Drawing.Point(338, 12);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(14, 12);
+ this.label4.TabIndex = 53;
+ this.label4.Text = "~";
+ //
+ // panel3
+ //
+ this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel3.Controls.Add(this.label1);
+ this.panel3.Controls.Add(this.cb_data_area);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel3.Location = new System.Drawing.Point(0, 0);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(229, 36);
+ this.panel3.TabIndex = 54;
+ //
+ // panel2
+ //
+ this.panel2.Controls.Add(this.dataGridView1);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(0, 36);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1449, 630);
+ this.panel2.TabIndex = 55;
//
// Search_Infor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1258, 666);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.cb_data_area);
- this.Controls.Add(this.btn_close);
- this.Controls.Add(this.cb_filter);
- this.Controls.Add(this.dataGridView1);
- this.Controls.Add(this.btn_search);
- this.Controls.Add(this.tb_search);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.label1);
+ this.ClientSize = new System.Drawing.Size(1449, 666);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.panel1);
this.Name = "Search_Infor";
this.Text = "소장자료검색";
this.Load += new System.EventHandler(this.Search_Infor_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel5.ResumeLayout(false);
+ this.panel5.PerformLayout();
+ this.panel4.ResumeLayout(false);
+ this.panel4.PerformLayout();
+ this.panel3.ResumeLayout(false);
+ this.panel3.PerformLayout();
+ this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox tb_search;
private System.Windows.Forms.Button btn_search;
private System.Windows.Forms.ComboBox cb_filter;
private System.Windows.Forms.Button btn_close;
private System.Windows.Forms.ComboBox cb_data_area;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ComboBox cb_filterDetail;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.Panel panel4;
+ private System.Windows.Forms.Panel panel5;
+ private System.Windows.Forms.DateTimePicker dtp_Start;
+ private System.Windows.Forms.DateTimePicker dtp_End;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn grade;
+ private System.Windows.Forms.DataGridViewTextBoxColumn User;
+ private System.Windows.Forms.DataGridViewTextBoxColumn date;
private System.Windows.Forms.DataGridViewTextBoxColumn ISBN;
private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn sBookName;
private System.Windows.Forms.DataGridViewTextBoxColumn author;
private System.Windows.Forms.DataGridViewTextBoxColumn book_comp;
private System.Windows.Forms.DataGridViewTextBoxColumn price;
@@ -257,6 +414,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Marc;
private System.Windows.Forms.DataGridViewTextBoxColumn etc1;
private System.Windows.Forms.DataGridViewTextBoxColumn etc2;
- private System.Windows.Forms.Label label3;
+ public System.Windows.Forms.DataGridView dataGridView1;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Search_Infor.cs b/unimarc/unimarc/마크/Search_Infor.cs
index fe3a573..1baf692 100644
--- a/unimarc/unimarc/마크/Search_Infor.cs
+++ b/unimarc/unimarc/마크/Search_Infor.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using UniMarc.마크;
using WindowsFormsApp1.마크;
namespace WindowsFormsApp1.Mac
@@ -26,76 +27,134 @@ namespace WindowsFormsApp1.Mac
{
db.DBcon();
- string[] area = { "국립 중앙 도서관", "자체 저장 DB" };
+ string[] area = { "자체 DB", "국립 중앙 도서관" };
cb_data_area.Items.AddRange(area);
- string[] filter = { "도서명", "저자", "출판사", "ISBN" };
- cb_filter.Items.AddRange(filter);
+ cb_data_area.SelectedIndex = 0;
- for(int a= 0; a < dataGridView1.Columns.Count; a++)
- {
- if (a != 7 && a != 8)
- dataGridView1.Columns[a].ReadOnly = true;
- }
+ dataGridView1.Columns["etc1"].ReadOnly = true;
+ dataGridView1.Columns["etc2"].ReadOnly = true;
}
private void btn_search_Click(object sender, EventArgs e)
{
dataGridView1.Rows.Clear();
- string target = string.Empty;
- string Area = string.Empty;
- if (cb_data_area.SelectedIndex == -1) {
- MessageBox.Show("검색필터를 선택해주세요!");
- cb_data_area.Focus();
- return;
- }
- if (cb_filter.SelectedIndex == -1) {
- MessageBox.Show("검색필터를 선택해주세요!");
- cb_filter.Focus();
- return;
- }
- target = setting_target();
- if(cb_data_area.SelectedIndex == 0) {
- db.DBcon_cl();
- Area = "`grade`, `isbn`, `book_name`, `author`, `book_comp`, `price`, `years`, `marc`, `etc`, `etc`";
- }
- else if(cb_data_area.SelectedIndex == 1) {
+ string Table = "Marc";
+ if (cb_data_area.SelectedIndex == 0)
+ {
db.DBcon();
- Area = "`grade`, `ISBN`, `서명`, `저자`, `출판사`, `출판년월`, `가격`, `marc`, `비고1`, `비고2`";
+ string Area = "`idx`, `grade`, `user`, `date`, `isbn`, `서명`, "
+ + "`총서명`, `저자`, `출판사`, `가격`, `출판년월`, "
+ + "`marc`, `비고1`, `비고2`";
+
+ (string target, string searchText) = setting_target(true);
+
+ string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, MakeWHEREQurey(target, searchText));
+ string db_res = db.DB_Send_CMD_Search(cmd);
+ string[] tmp_arr = db_res.Split('|');
+ inputGrid_MyDB(tmp_arr);
+
+ }
+ else if (cb_data_area.SelectedIndex == 1)
+ {
+ db.DBcon_cl();
+ // -user date 비고2
+ string Area = "`idx`, `grade`, `isbn`, `book_name`, `series`, `author`, "
+ + "`book_comp`, `price`, `years`, `marc`, `etc`";
+
+ (string target, string searchText) = setting_target(false);
+
+ string cmd = string.Format("SELECT {0} FROM `{1}` {2}", Area, Table, MakeWHEREQurey(target, searchText));
+ string db_res = db.DB_Send_CMD_Search(cmd);
+ string[] tmp_arr = db_res.Split('|');
+ inputGrid_ClDB(tmp_arr);
}
- string cmd = db.DB_Contains("Marc", "none", target, tb_search.Text, Area);
- string db_res = db.DB_Send_CMD_Search(cmd);
- string[] tmp_arr = db_res.Split('|');
- input_grid(tmp_arr);
- label3.Text = string.Format("결과 {0:0,0}건", dataGridView1.Rows.Count.ToString());
+ label3.Text = string.Format("검색결과 {0:0,0}건", dataGridView1.Rows.Count.ToString());
}
#region search_Click_Sub
+ string MakeWHEREQurey(string target, string searchText)
+ {
+ string Where;
+ if (target == "date")
+ {
+ string start = dtp_Start.Text;
+ string end = dtp_End.Text;
+ Where = string.Format("WHERE `compidx` = \"{3}\" AND `{0}` >= \"{1}\" AND `{0}` <= \"{2}\"", target, start, end, compidx);
+ }
+ else if (target == "")
+ {
+ Where = "";
+ }
+ else
+ {
+ Where = string.Format("WHERE `compidx` = \"{2}\" AND `{0}` LIKE \"%{1}%\"", target, searchText, compidx);
+ }
+ return Where;
+ }
+
///
/// 검색결과에 따라 Grid를 새로 그림
///
///
- void input_grid(string[] arr)
+ void inputGrid_MyDB(string[] arr)
{
- string[] grid = { "", "", "", "", "",
- "", "", "", "", "" };
- for(int a = 0; a < arr.Length; a++)
+ string[] grid = {
+ "", "", "", "", "",
+ "", "", "", "", "",
+ "", "", "", ""
+ };
+
+ for (int a = 0; a < arr.Length; a++)
{
- if (a % 10 == 0) grid[0] = Change_Grade(arr[a]);
- if (a % 10 == 1) grid[1] = arr[a];
- if (a % 10 == 2) grid[2] = arr[a];
- if (a % 10 == 3) grid[3] = arr[a];
- if (a % 10 == 4) grid[4] = arr[a];
- if (a % 10 == 5) grid[5] = arr[a];
- if (a % 10 == 6) grid[6] = arr[a];
- if (a % 10 == 7) grid[7] = arr[a];
- if (a % 10 == 8) grid[8] = arr[a];
- if (a % 10 == 9) {
- grid[9] = arr[a];
+ if (a % 14 == 0) grid[0] = arr[a];
+ if (a % 14 == 1) grid[1] = Change_Grade(arr[a]);
+ if (a % 14 == 2) grid[2] = arr[a];
+ if (a % 14 == 3) grid[3] = arr[a];
+ if (a % 14 == 4) grid[4] = arr[a];
+ if (a % 14 == 5) grid[5] = arr[a];
+ if (a % 14 == 6) grid[6] = arr[a];
+ if (a % 14 == 7) grid[7] = arr[a];
+ if (a % 14 == 8) grid[8] = arr[a];
+ if (a % 14 == 9) grid[9] = arr[a];
+ if (a % 14 == 10) grid[10] = arr[a];
+ if (a % 14 == 11) grid[11] = arr[a];
+ if (a % 14 == 12) grid[12] = arr[a];
+ if (a % 14 == 13) {
+ grid[13] = arr[a];
dataGridView1.Rows.Add(grid);
}
}
}
+
+ void inputGrid_ClDB(string[] arr)
+ {
+ string[] grid = {
+ "", "", "", "", "",
+ "", "", "", "", "",
+ "", "", "", ""
+ };
+
+ for (int a = 0; a < arr.Length; a++)
+ {
+ if (a % 11 == 0) grid[0] = arr[a]; // idx
+ if (a % 11 == 1) grid[1] = Change_Grade(arr[a]); // grade
+ if (a % 11 == 2) grid[4] = arr[a]; // isbn
+ if (a % 11 == 3) grid[5] = arr[a]; // book_name
+ if (a % 11 == 4) grid[6] = arr[a]; // series
+ if (a % 11 == 5) grid[7] = arr[a]; // author
+ if (a % 11 == 6) grid[8] = arr[a]; // book_comp
+ if (a % 11 == 7) grid[9] = arr[a]; // price
+ if (a % 11 == 8) grid[10] = arr[a]; // years
+ if (a % 11 == 9) grid[11] = arr[a]; // marc
+ if (a % 11 == 10) // etc
+ {
+ grid[12] = arr[a];
+ dataGridView1.Rows.Add(grid);
+ }
+ }
+ }
+
///
/// idx값에 따라 Grade를 보기 쉽게 바꿔줌.
///
@@ -118,8 +177,18 @@ namespace WindowsFormsApp1.Mac
case "3":
result = "A";
break;
- default:
- result = "null";
+
+ case "D":
+ result = "0";
+ break;
+ case "C":
+ result = "1";
+ break;
+ case "B":
+ result = "2";
+ break;
+ case "A":
+ result = "3";
break;
}
return result;
@@ -128,24 +197,40 @@ namespace WindowsFormsApp1.Mac
/// 검색 필터에 따라 target이 변경됨
///
///
- string setting_target()
+ (string, string) setting_target(bool isMyDB)
{
- string res = string.Empty;
- if (cb_data_area.SelectedIndex == 0)
+ string res = "";
+ string search = "";
+ if (isMyDB)
{
switch (cb_filter.SelectedIndex)
{
- case 0:
- res = "book_name";
- break;
case 1:
- res = "author";
+ res = "서명";
+ search = tb_search.Text;
break;
case 2:
- res = "book_comp";
+ res = "저자";
+ search = tb_search.Text;
break;
case 3:
+ res = "출판사";
+ search = tb_search.Text;
+ break;
+ case 4:
res = "isbn";
+ search = tb_search.Text;
+ break;
+ case 5:
+ res = "grade";
+ search = Change_Grade(cb_filterDetail.Text);
+ break;
+ case 6:
+ res = "user";
+ search = cb_filterDetail.Text;
+ break;
+ case 7:
+ res = "date";
break;
default:
break;
@@ -155,23 +240,31 @@ namespace WindowsFormsApp1.Mac
{
switch (cb_filter.SelectedIndex)
{
- case 0:
- res = "서명";
- break;
case 1:
- res = cb_filter.Text;
+ res = "book_name";
+ search = tb_search.Text;
break;
case 2:
- res = cb_filter.Text;
+ res = "author";
+ search = tb_search.Text;
break;
case 3:
- res = cb_filter.Text;
+ res = "book_comp";
+ search = tb_search.Text;
+ break;
+ case 4:
+ res = "isbn";
+ search = tb_search.Text;
+ break;
+ case 5:
+ res = "grade";
+ search = Change_Grade(cb_filterDetail.Text);
break;
default:
break;
}
}
- return res;
+ return (res, search);
}
#endregion
@@ -179,10 +272,30 @@ namespace WindowsFormsApp1.Mac
{
int row = e.RowIndex;
- Search_Infor_Sub sis = new Search_Infor_Sub(this);
- sis.isbn = dataGridView1.Rows[row].Cells["ISBN"].Value.ToString();
- sis.marc = dataGridView1.Rows[row].Cells["Marc"].Value.ToString();
- sis.Show();
+ string idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString();
+
+ if (row < 0)
+ return;
+
+ Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this);
+ string[] Marc = {
+ dataGridView1.Rows[row].Cells["Marc"].Value.ToString(),
+ idx,
+ "",
+ "",
+ dataGridView1.Rows[row].Cells["ISBN"].Value.ToString()
+ };
+
+ me.row = row;
+ me.UserName = main.botUserLabel.Text;
+ me.Init(Marc);
+ me.btn_EditNum.Enabled = false;
+ me.Show();
+
+ // Search_Infor_Sub sis = new Search_Infor_Sub(this);
+ // sis.isbn = dataGridView1.Rows[row].Cells["ISBN"].Value.ToString();
+ // sis.marc = dataGridView1.Rows[row].Cells["Marc"].Value.ToString();
+ // sis.Show();
}
private void tb_search_KeyDown(object sender, KeyEventArgs e)
{
@@ -192,5 +305,64 @@ namespace WindowsFormsApp1.Mac
{
this.Close();
}
+
+ private void cb_data_area_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ cb_filter.Items.Clear();
+ List filter = new List
+ {
+ "전체", "도서명", "저자", "출판사", "ISBN", "등급"
+ };
+
+ if (cb_data_area.SelectedIndex == 0) {
+ filter.Add("작성자");
+ filter.Add("날짜");
+ }
+
+ string[] filterAry = filter.ToArray();
+
+ cb_filter.Items.AddRange(filterAry);
+ cb_filter.SelectedIndex = 0;
+ }
+
+ private void cb_filter_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ cb_filterDetail.Items.Clear();
+ cb_filterDetail.Enabled = true;
+
+ if (cb_filter.SelectedItem.ToString() == "등급")
+ {
+ string[] grade = { "A", "B", "C", "D" };
+ cb_filterDetail.Items.AddRange(grade);
+ cb_filterDetail.SelectedIndex = 0;
+ }
+ else if (cb_filter.SelectedItem.ToString() == "작성자")
+ {
+ cb_filterDetail.Items.Add("전체");
+ string compName = main.toolStripLabel2.Text;
+ string cmd = string.Format("SELECT `name` FROM `User_Data` WHERE `affil` = \"{0}\"", compName);
+ string res = db.self_Made_Cmd(cmd);
+ string[] Aryres = res.Split('|');
+
+ foreach (string PName in Aryres)
+ {
+ if (PName == "")
+ continue;
+ cb_filterDetail.Items.Add(PName);
+ }
+ cb_filterDetail.SelectedIndex = 0;
+ }
+ else if (cb_filter.SelectedItem.ToString() == "날짜")
+ {
+ dtp_Start.Enabled = true;
+ dtp_End.Enabled = true;
+ }
+ else
+ {
+ dtp_Start.Enabled = false;
+ dtp_End.Enabled = false;
+ cb_filterDetail.Enabled = false;
+ }
+ }
}
}
diff --git a/unimarc/unimarc/마크/Search_Infor.resx b/unimarc/unimarc/마크/Search_Infor.resx
index b9659dc..62c20f9 100644
--- a/unimarc/unimarc/마크/Search_Infor.resx
+++ b/unimarc/unimarc/마크/Search_Infor.resx
@@ -117,15 +117,27 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
True
+
+ True
+
+
+ True
+
True
True
+
+ True
+
True
diff --git a/unimarc/unimarc/마크/Symbol_Add.Designer.cs b/unimarc/unimarc/마크/Symbol_Add.Designer.cs
index 8ae85c4..1bcde4f 100644
--- a/unimarc/unimarc/마크/Symbol_Add.Designer.cs
+++ b/unimarc/unimarc/마크/Symbol_Add.Designer.cs
@@ -53,7 +53,13 @@
this.label5 = new System.Windows.Forms.Label();
this.rb_book2 = new System.Windows.Forms.RadioButton();
this.btn_close = new System.Windows.Forms.Button();
- this.button2 = new System.Windows.Forms.Button();
+ this.btn_OneTrans = new System.Windows.Forms.Button();
+ this.panel8 = new System.Windows.Forms.Panel();
+ this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.Author = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.AuthorSymbol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btn_GridTrans = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel6.SuspendLayout();
@@ -61,12 +67,14 @@
this.panel3.SuspendLayout();
this.panel4.SuspendLayout();
this.panel2.SuspendLayout();
+ this.panel8.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(16, 11);
+ this.label1.Location = new System.Drawing.Point(27, 12);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 5;
@@ -76,49 +84,50 @@
//
this.cb_symbol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_symbol.FormattingEnabled = true;
- this.cb_symbol.Location = new System.Drawing.Point(180, 7);
+ this.cb_symbol.Location = new System.Drawing.Point(191, 8);
this.cb_symbol.Name = "cb_symbol";
this.cb_symbol.Size = new System.Drawing.Size(366, 20);
- this.cb_symbol.TabIndex = 6;
+ this.cb_symbol.TabIndex = 0;
this.cb_symbol.SelectedIndexChanged += new System.EventHandler(this.cb_symbol_SelectedIndexChanged);
//
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel1.Controls.Add(this.tb_result);
+ this.panel1.Controls.Add(this.panel8);
this.panel1.Controls.Add(this.panel7);
- this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.panel6);
this.panel1.Controls.Add(this.panel5);
this.panel1.Controls.Add(this.panel3);
this.panel1.Controls.Add(this.panel4);
this.panel1.Controls.Add(this.panel2);
- this.panel1.Location = new System.Drawing.Point(12, 12);
+ this.panel1.Location = new System.Drawing.Point(431, 41);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(578, 253);
+ this.panel1.Size = new System.Drawing.Size(578, 261);
this.panel1.TabIndex = 7;
//
// tb_result
//
- this.tb_result.Location = new System.Drawing.Point(180, 223);
+ this.tb_result.Location = new System.Drawing.Point(191, 7);
this.tb_result.Name = "tb_result";
this.tb_result.Size = new System.Drawing.Size(366, 21);
- this.tb_result.TabIndex = 7;
+ this.tb_result.TabIndex = 0;
//
// panel7
//
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel7.Controls.Add(this.cb_symbol);
- this.panel7.Controls.Add(this.label1);
- this.panel7.Location = new System.Drawing.Point(-1, -1);
+ this.panel7.Controls.Add(this.rb_moum1);
+ this.panel7.Controls.Add(this.label6);
+ this.panel7.Controls.Add(this.rb_moum2);
+ this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel7.Location = new System.Drawing.Point(0, 185);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(578, 37);
- this.panel7.TabIndex = 9;
+ this.panel7.Size = new System.Drawing.Size(576, 37);
+ this.panel7.TabIndex = 5;
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(16, 227);
+ this.label7.Location = new System.Drawing.Point(27, 11);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(77, 12);
this.label7.TabIndex = 5;
@@ -127,24 +136,26 @@
// panel6
//
this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel6.Controls.Add(this.tb_author);
- this.panel6.Controls.Add(this.label2);
- this.panel6.Location = new System.Drawing.Point(-1, 35);
+ this.panel6.Controls.Add(this.rb_book1);
+ this.panel6.Controls.Add(this.label5);
+ this.panel6.Controls.Add(this.rb_book2);
+ this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel6.Location = new System.Drawing.Point(0, 148);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(578, 37);
- this.panel6.TabIndex = 9;
+ this.panel6.Size = new System.Drawing.Size(576, 37);
+ this.panel6.TabIndex = 4;
//
// tb_author
//
- this.tb_author.Location = new System.Drawing.Point(180, 7);
+ this.tb_author.Location = new System.Drawing.Point(191, 7);
this.tb_author.Name = "tb_author";
this.tb_author.Size = new System.Drawing.Size(366, 21);
- this.tb_author.TabIndex = 7;
+ this.tb_author.TabIndex = 0;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(16, 11);
+ this.label2.Location = new System.Drawing.Point(27, 11);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(63, 12);
this.label2.TabIndex = 5;
@@ -153,24 +164,26 @@
// panel5
//
this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel5.Controls.Add(this.tb_book);
- this.panel5.Controls.Add(this.label3);
- this.panel5.Location = new System.Drawing.Point(-1, 71);
+ this.panel5.Controls.Add(this.rb_author1);
+ this.panel5.Controls.Add(this.label4);
+ this.panel5.Controls.Add(this.rb_author2);
+ this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel5.Location = new System.Drawing.Point(0, 111);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(578, 37);
- this.panel5.TabIndex = 9;
+ this.panel5.Size = new System.Drawing.Size(576, 37);
+ this.panel5.TabIndex = 3;
//
// tb_book
//
- this.tb_book.Location = new System.Drawing.Point(180, 7);
+ this.tb_book.Location = new System.Drawing.Point(191, 7);
this.tb_book.Name = "tb_book";
this.tb_book.Size = new System.Drawing.Size(366, 21);
- this.tb_book.TabIndex = 7;
+ this.tb_book.TabIndex = 0;
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(16, 11);
+ this.label3.Location = new System.Drawing.Point(27, 11);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(29, 12);
this.label3.TabIndex = 5;
@@ -179,21 +192,21 @@
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel3.Controls.Add(this.rb_author1);
- this.panel3.Controls.Add(this.label4);
- this.panel3.Controls.Add(this.rb_author2);
- this.panel3.Location = new System.Drawing.Point(-1, 107);
+ this.panel3.Controls.Add(this.tb_book);
+ this.panel3.Controls.Add(this.label3);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel3.Location = new System.Drawing.Point(0, 74);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(578, 37);
- this.panel3.TabIndex = 9;
+ this.panel3.Size = new System.Drawing.Size(576, 37);
+ this.panel3.TabIndex = 2;
//
// rb_author1
//
this.rb_author1.AutoSize = true;
- this.rb_author1.Location = new System.Drawing.Point(184, 9);
+ this.rb_author1.Location = new System.Drawing.Point(195, 9);
this.rb_author1.Name = "rb_author1";
this.rb_author1.Size = new System.Drawing.Size(95, 16);
- this.rb_author1.TabIndex = 8;
+ this.rb_author1.TabIndex = 0;
this.rb_author1.TabStop = true;
this.rb_author1.Text = "저자음절표시";
this.rb_author1.UseVisualStyleBackColor = true;
@@ -202,7 +215,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(16, 11);
+ this.label4.Location = new System.Drawing.Point(27, 11);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(107, 12);
this.label4.TabIndex = 5;
@@ -211,10 +224,10 @@
// rb_author2
//
this.rb_author2.AutoSize = true;
- this.rb_author2.Location = new System.Drawing.Point(417, 9);
+ this.rb_author2.Location = new System.Drawing.Point(428, 9);
this.rb_author2.Name = "rb_author2";
this.rb_author2.Size = new System.Drawing.Size(95, 16);
- this.rb_author2.TabIndex = 8;
+ this.rb_author2.TabIndex = 1;
this.rb_author2.TabStop = true;
this.rb_author2.Text = "저자초성표시";
this.rb_author2.UseVisualStyleBackColor = true;
@@ -223,21 +236,21 @@
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel4.Controls.Add(this.rb_moum1);
- this.panel4.Controls.Add(this.label6);
- this.panel4.Controls.Add(this.rb_moum2);
- this.panel4.Location = new System.Drawing.Point(-1, 179);
+ this.panel4.Controls.Add(this.tb_author);
+ this.panel4.Controls.Add(this.label2);
+ this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel4.Location = new System.Drawing.Point(0, 37);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(578, 37);
- this.panel4.TabIndex = 9;
+ this.panel4.Size = new System.Drawing.Size(576, 37);
+ this.panel4.TabIndex = 1;
//
// rb_moum1
//
this.rb_moum1.AutoSize = true;
- this.rb_moum1.Location = new System.Drawing.Point(184, 9);
+ this.rb_moum1.Location = new System.Drawing.Point(195, 9);
this.rb_moum1.Name = "rb_moum1";
this.rb_moum1.Size = new System.Drawing.Size(129, 16);
- this.rb_moum1.TabIndex = 8;
+ this.rb_moum1.TabIndex = 0;
this.rb_moum1.TabStop = true;
this.rb_moum1.Text = "모음기호보류(원칙)";
this.rb_moum1.UseVisualStyleBackColor = true;
@@ -246,7 +259,7 @@
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(16, 11);
+ this.label6.Location = new System.Drawing.Point(27, 11);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(95, 12);
this.label6.TabIndex = 5;
@@ -255,10 +268,10 @@
// rb_moum2
//
this.rb_moum2.AutoSize = true;
- this.rb_moum2.Location = new System.Drawing.Point(417, 9);
+ this.rb_moum2.Location = new System.Drawing.Point(428, 9);
this.rb_moum2.Name = "rb_moum2";
this.rb_moum2.Size = new System.Drawing.Size(95, 16);
- this.rb_moum2.TabIndex = 8;
+ this.rb_moum2.TabIndex = 1;
this.rb_moum2.TabStop = true;
this.rb_moum2.Text = "모음기호표시";
this.rb_moum2.UseVisualStyleBackColor = true;
@@ -267,21 +280,21 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Controls.Add(this.rb_book1);
- this.panel2.Controls.Add(this.label5);
- this.panel2.Controls.Add(this.rb_book2);
- this.panel2.Location = new System.Drawing.Point(-1, 143);
+ this.panel2.Controls.Add(this.cb_symbol);
+ this.panel2.Controls.Add(this.label1);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(578, 37);
- this.panel2.TabIndex = 9;
+ this.panel2.Size = new System.Drawing.Size(576, 37);
+ this.panel2.TabIndex = 0;
//
// rb_book1
//
this.rb_book1.AutoSize = true;
- this.rb_book1.Location = new System.Drawing.Point(184, 9);
+ this.rb_book1.Location = new System.Drawing.Point(195, 10);
this.rb_book1.Name = "rb_book1";
this.rb_book1.Size = new System.Drawing.Size(95, 16);
- this.rb_book1.TabIndex = 8;
+ this.rb_book1.TabIndex = 0;
this.rb_book1.TabStop = true;
this.rb_book1.Text = "서명음절표시";
this.rb_book1.UseVisualStyleBackColor = true;
@@ -290,7 +303,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(16, 11);
+ this.label5.Location = new System.Drawing.Point(27, 12);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(107, 12);
this.label5.TabIndex = 5;
@@ -299,10 +312,10 @@
// rb_book2
//
this.rb_book2.AutoSize = true;
- this.rb_book2.Location = new System.Drawing.Point(417, 3);
+ this.rb_book2.Location = new System.Drawing.Point(428, 4);
this.rb_book2.Name = "rb_book2";
this.rb_book2.Size = new System.Drawing.Size(129, 28);
- this.rb_book2.TabIndex = 8;
+ this.rb_book2.TabIndex = 1;
this.rb_book2.TabStop = true;
this.rb_book2.Text = "서명초성표시\r\n(한글이 아닐경우X)";
this.rb_book2.UseVisualStyleBackColor = true;
@@ -310,37 +323,90 @@
//
// btn_close
//
- this.btn_close.Location = new System.Drawing.Point(363, 274);
+ this.btn_close.Location = new System.Drawing.Point(934, 12);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(75, 23);
- this.btn_close.TabIndex = 11;
+ this.btn_close.TabIndex = 2;
this.btn_close.Text = "닫 기";
this.btn_close.UseVisualStyleBackColor = true;
this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
//
- // button2
+ // btn_OneTrans
//
- this.button2.Location = new System.Drawing.Point(162, 274);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(75, 23);
- this.button2.TabIndex = 11;
- this.button2.Text = "변 환";
- this.button2.UseVisualStyleBackColor = true;
- this.button2.Click += new System.EventHandler(this.button2_Click);
+ this.btn_OneTrans.Location = new System.Drawing.Point(853, 12);
+ this.btn_OneTrans.Name = "btn_OneTrans";
+ this.btn_OneTrans.Size = new System.Drawing.Size(75, 23);
+ this.btn_OneTrans.TabIndex = 1;
+ this.btn_OneTrans.Text = "개별 변환";
+ this.btn_OneTrans.UseVisualStyleBackColor = true;
+ this.btn_OneTrans.Click += new System.EventHandler(this.button2_Click);
+ //
+ // panel8
+ //
+ this.panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel8.Controls.Add(this.tb_result);
+ this.panel8.Controls.Add(this.label7);
+ this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel8.Location = new System.Drawing.Point(0, 222);
+ this.panel8.Name = "panel8";
+ this.panel8.Size = new System.Drawing.Size(576, 37);
+ this.panel8.TabIndex = 6;
+ //
+ // dataGridView1
+ //
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.Author,
+ this.book_name,
+ this.AuthorSymbol});
+ this.dataGridView1.Location = new System.Drawing.Point(12, 12);
+ this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.RowTemplate.Height = 23;
+ this.dataGridView1.Size = new System.Drawing.Size(413, 664);
+ this.dataGridView1.TabIndex = 12;
+ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
+ this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
+ //
+ // Author
+ //
+ this.Author.HeaderText = "저자";
+ this.Author.Name = "Author";
+ //
+ // book_name
+ //
+ this.book_name.HeaderText = "도서명";
+ this.book_name.Name = "book_name";
+ this.book_name.Width = 150;
+ //
+ // AuthorSymbol
+ //
+ this.AuthorSymbol.HeaderText = "저자기호";
+ this.AuthorSymbol.Name = "AuthorSymbol";
+ //
+ // btn_GridTrans
+ //
+ this.btn_GridTrans.Location = new System.Drawing.Point(772, 12);
+ this.btn_GridTrans.Name = "btn_GridTrans";
+ this.btn_GridTrans.Size = new System.Drawing.Size(75, 23);
+ this.btn_GridTrans.TabIndex = 0;
+ this.btn_GridTrans.Text = "표 변환";
+ this.btn_GridTrans.UseVisualStyleBackColor = true;
+ this.btn_GridTrans.Click += new System.EventHandler(this.btn_GridTrans_Click);
//
// Symbol_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
- this.Controls.Add(this.button2);
- this.Controls.Add(this.btn_close);
+ this.ClientSize = new System.Drawing.Size(1022, 688);
+ this.Controls.Add(this.btn_GridTrans);
this.Controls.Add(this.panel1);
+ this.Controls.Add(this.btn_OneTrans);
+ this.Controls.Add(this.btn_close);
+ this.Controls.Add(this.dataGridView1);
this.Name = "Symbol_Add";
this.Text = "저자기호 생성";
this.Load += new System.EventHandler(this.Symbol_Add_Load);
this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
this.panel7.ResumeLayout(false);
this.panel7.PerformLayout();
this.panel6.ResumeLayout(false);
@@ -353,6 +419,9 @@
this.panel4.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
+ this.panel8.ResumeLayout(false);
+ this.panel8.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.ResumeLayout(false);
}
@@ -384,6 +453,12 @@
private System.Windows.Forms.TextBox tb_result;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Button btn_close;
- private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Button btn_OneTrans;
+ private System.Windows.Forms.Panel panel8;
+ private System.Windows.Forms.DataGridView dataGridView1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Author;
+ private System.Windows.Forms.DataGridViewTextBoxColumn book_name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn AuthorSymbol;
+ private System.Windows.Forms.Button btn_GridTrans;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Symbol_Add.cs b/unimarc/unimarc/마크/Symbol_Add.cs
index 2194eb1..14ddc8c 100644
--- a/unimarc/unimarc/마크/Symbol_Add.cs
+++ b/unimarc/unimarc/마크/Symbol_Add.cs
@@ -36,7 +36,6 @@ namespace WindowsFormsApp1.Mac
private void button2_Click(object sender, EventArgs e)
{
-
string res = tb_author.Text;
string book = tb_book.Text;
@@ -53,7 +52,7 @@ namespace WindowsFormsApp1.Mac
return;
}
}
- else if(cb_symbol.Text == "동서양 저자기호법 (국중)") { }
+ else if (cb_symbol.Text == "동서양 저자기호법 (국중)") { }
else
{
if (!CheckKor(res))
@@ -62,58 +61,48 @@ namespace WindowsFormsApp1.Mac
return;
}
}
- /*
- char aut;
- if (tb_author.Text.Length <= 1)
- aut = tb_author.Text[0];
- else
- aut = tb_author.Text[1];
- string rb1 = sb.Author_Fillter(tb_author.Text[0], rb_author1.Checked);
+ bool AuthorLookUp = rb_author1.Checked;
+ bool BookLookUp = rb_book1.Checked;
- #region 콤보박스 선택
- if (cb_symbol.SelectedIndex == 0) // 이재철 1표
- res = sb.Symbol_1(aut);
- if (cb_symbol.SelectedIndex == 1) // 이재철 2표
- res = sb.Symbol_2(aut);
- if (cb_symbol.SelectedIndex == 2) // 이재철 3표
- res = sb.Symbol_3(aut);
- if (cb_symbol.SelectedIndex == 3) // 이재철 4표
- res = sb.Symbol_4(aut);
- if (cb_symbol.SelectedIndex == 4) // 이재철 5표
- res = sb.Symbol_5(aut);
- if (cb_symbol.SelectedIndex == 5) // 이재철 6표
- res = sb.Symbol_6(aut);
- if (cb_symbol.SelectedIndex == 6) // 이재철 7표
- res = sb.Symbol_7(aut);
- if (cb_symbol.SelectedIndex == 7) // 이재철 7표 (동양서저자기호표)
- res = sb.Symbol_7_동서(aut);
- if (cb_symbol.SelectedIndex == 8) // 이재철 8표
- res = sb.Symbol_8(aut);
- if (cb_symbol.SelectedIndex == 9) // 이재철 8표 (동양서저자기호표)
- res = sb.Symbol_8_동서(aut);
- if (cb_symbol.SelectedIndex == 10) // 장일세
- res = sb.Symbol_Jang(res);
- if (cb_symbol.SelectedIndex == 11) // 커터샌본
- res = sb.Cutter(res);
- if (cb_symbol.SelectedIndex == 12) { // 엘러드
- res = sb.Elord(res);
- rb1 = "";
- }
- if (cb_symbol.SelectedIndex == 13) { // 동서양 저자기호표(국중)
- res = sb.NLK(res);
- }
- #endregion
- res = res.Replace("|", "");
-
- res = sb.Moum_Fillter(res, rb_moum1.Checked);
- string rb2 = sb.Book_Fillter(book, rb_book1.Checked);
- string result = string.Format("{0}{1}{2}", rb1, res, rb2);
- */
- bool[] isType = { rb_author1.Checked, rb_book1.Checked };
- string result = sb.SymbolAuthor(res, book, cb_symbol.SelectedItem.ToString(), isType);
+ bool[] isType = { AuthorLookUp, BookLookUp };
+ string result = "";
+ if (cb_symbol.SelectedIndex >= 0)
+ result = sb.SymbolAuthor(res, book, cb_symbol.SelectedItem.ToString(), isType);
+
tb_result.Text = result;
}
+
+ private void btn_GridTrans_Click(object sender, EventArgs e)
+ {
+ int count = dataGridView1.Rows.Count;
+ for (int a = 0; a < count; a++)
+ {
+ if (dataGridView1.Rows[a].Cells["Author"].Value == null)
+ continue;
+
+ string author = dataGridView1.Rows[a].Cells["Author"].Value.ToString();
+ string BookName = dataGridView1.Rows[a].Cells["book_name"].Value.ToString();
+
+ tb_author.Text = author;
+ tb_book.Text = BookName;
+
+ button2_Click(sender, e);
+
+ string result = tb_result.Text;
+
+ if (result.IndexOf("NH") > -1)
+ dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow;
+ else
+ dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.White;
+
+ dataGridView1.Rows[a].Cells["AuthorSymbol"].Value = result;
+ }
+ tb_author.Text = "";
+ tb_book.Text = "";
+ tb_result.Text = "";
+ }
+
#region Btn2_Sub
private bool CheckEng(string Value)
{
@@ -186,5 +175,17 @@ namespace WindowsFormsApp1.Mac
rb_moum2.Enabled = true;
}
}
+
+ private void dataGridView1_KeyDown(object sender, KeyEventArgs e)
+ {
+ Skill_Grid sg = new Skill_Grid();
+ sg.Excel_to_DataGridView(sender, e);
+ }
+
+ private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+ {
+ Skill_Grid sg = new Skill_Grid();
+ sg.Print_Grid_Num(sender, e);
+ }
}
}
diff --git a/unimarc/unimarc/마크/Symbol_Add.resx b/unimarc/unimarc/마크/Symbol_Add.resx
index 1af7de1..e6295f2 100644
--- a/unimarc/unimarc/마크/Symbol_Add.resx
+++ b/unimarc/unimarc/마크/Symbol_Add.resx
@@ -117,4 +117,22 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Symbol_Sub.cs b/unimarc/unimarc/마크/Symbol_Sub.cs
index 65e291d..acf9dee 100644
--- a/unimarc/unimarc/마크/Symbol_Sub.cs
+++ b/unimarc/unimarc/마크/Symbol_Sub.cs
@@ -97,7 +97,8 @@ namespace AuthorSymbol
"5", "5", "5", "5",
"6",
"7", "7", "7", "7", "7",
- "8"
+ "8", "8",
+ "9"
};
#endregion
@@ -1508,32 +1509,41 @@ namespace AuthorSymbol
if (resAuthor == "")
return "";
- if (resBook == "")
- return "";
-
string res = resAuthor + authorType + resBook;
return res;
}
+ ///
+ /// 저자 음절/초성 표시
+ ///
+ ///
+ ///
+ ///
private string Author_Fillter(char Author, bool rb)
{
if (rb)
return Author.ToString();
HANGUL_INFO info = HangulJaso.DevideJaso(Author);
- if (info.isHangul == "NH" || !rb)
+ if (info.isHangul == "NH")
return "";
return info.chars[0].ToString();
}
+ ///
+ /// 도서명 음절/초성 표시
+ ///
+ ///
+ ///
+ ///
private string Book_Fillter(string book, bool rb)
{
if (book == "")
return "";
HANGUL_INFO info = HangulJaso.DevideJaso(book[0]);
- if (info.isHangul == "NH" || !rb)
+ if (info.isHangul == "NH")
return "";
if (rb)
diff --git a/unimarc/unimarc/마크/Zoom_Picture.Designer.cs b/unimarc/unimarc/마크/Zoom_Picture.Designer.cs
index 5741287..68a7eee 100644
--- a/unimarc/unimarc/마크/Zoom_Picture.Designer.cs
+++ b/unimarc/unimarc/마크/Zoom_Picture.Designer.cs
@@ -30,7 +30,15 @@ namespace UniMarc.마크
private void InitializeComponent()
{
this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.btn_Preview = new System.Windows.Forms.Button();
+ this.btn_Close = new System.Windows.Forms.Button();
+ this.webBrowser1 = new System.Windows.Forms.WebBrowser();
+ this.btn_Photo = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
this.SuspendLayout();
//
// pictureBox1
@@ -38,22 +46,86 @@ namespace UniMarc.마크
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(331, 446);
+ this.pictureBox1.Size = new System.Drawing.Size(544, 671);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
+ // panel1
+ //
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.btn_Close);
+ this.panel1.Controls.Add(this.btn_Photo);
+ this.panel1.Controls.Add(this.btn_Preview);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(544, 40);
+ this.panel1.TabIndex = 1;
+ //
+ // panel2
+ //
+ this.panel2.Controls.Add(this.pictureBox1);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(0, 40);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(544, 671);
+ this.panel2.TabIndex = 2;
+ //
+ // btn_Preview
+ //
+ this.btn_Preview.Location = new System.Drawing.Point(378, 8);
+ this.btn_Preview.Name = "btn_Preview";
+ this.btn_Preview.Size = new System.Drawing.Size(75, 23);
+ this.btn_Preview.TabIndex = 0;
+ this.btn_Preview.Text = "미리보기";
+ this.btn_Preview.UseVisualStyleBackColor = true;
+ this.btn_Preview.Click += new System.EventHandler(this.btn_Preview_Click);
+ //
+ // btn_Close
+ //
+ this.btn_Close.Location = new System.Drawing.Point(459, 8);
+ this.btn_Close.Name = "btn_Close";
+ this.btn_Close.Size = new System.Drawing.Size(75, 23);
+ this.btn_Close.TabIndex = 0;
+ this.btn_Close.Text = "닫 기";
+ this.btn_Close.UseVisualStyleBackColor = true;
+ this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+ //
+ // webBrowser1
+ //
+ this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webBrowser1.Location = new System.Drawing.Point(0, 0);
+ this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
+ this.webBrowser1.Name = "webBrowser1";
+ this.webBrowser1.Size = new System.Drawing.Size(544, 711);
+ this.webBrowser1.TabIndex = 3;
+ //
+ // btn_Photo
+ //
+ this.btn_Photo.Location = new System.Drawing.Point(297, 8);
+ this.btn_Photo.Name = "btn_Photo";
+ this.btn_Photo.Size = new System.Drawing.Size(75, 23);
+ this.btn_Photo.TabIndex = 0;
+ this.btn_Photo.Text = "사진보기";
+ this.btn_Photo.UseVisualStyleBackColor = true;
+ this.btn_Photo.Click += new System.EventHandler(this.btn_Photo_Click);
+ //
// Zoom_Picture
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(331, 446);
- this.Controls.Add(this.pictureBox1);
+ this.ClientSize = new System.Drawing.Size(544, 711);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.webBrowser1);
this.Name = "Zoom_Picture";
this.Text = "크게보기";
this.Load += new System.EventHandler(this.Zoom_Picture_Load);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Zoom_Picture_KeyDown);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -61,5 +133,11 @@ namespace UniMarc.마크
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Button btn_Close;
+ private System.Windows.Forms.Button btn_Preview;
+ private System.Windows.Forms.WebBrowser webBrowser1;
+ private System.Windows.Forms.Button btn_Photo;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Zoom_Picture.cs b/unimarc/unimarc/마크/Zoom_Picture.cs
index c31441c..16dc66b 100644
--- a/unimarc/unimarc/마크/Zoom_Picture.cs
+++ b/unimarc/unimarc/마크/Zoom_Picture.cs
@@ -13,6 +13,7 @@ namespace UniMarc.마크
public partial class Zoom_Picture : Form
{
public string url = "";
+ public string ISBN = "";
public Zoom_Picture()
{
InitializeComponent();
@@ -20,11 +21,37 @@ namespace UniMarc.마크
private void Zoom_Picture_Load(object sender, EventArgs e)
{
pictureBox1.ImageLocation = url;
+
+ string PreViewURL =
+ string.Format("http://preview.kyobobook.co.kr/preview.jsp?siteGb=INK&ejkGb=KOR&barcode={0}&loginYn=N&orderClick=JAW",
+ ISBN);
+
+ webBrowser1.Navigate(PreViewURL);
}
private void Zoom_Picture_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape) { this.Close(); }
}
+
+ private void btn_Close_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void btn_Preview_Click(object sender, EventArgs e)
+ {
+ // 1300, 750
+ this.Size = new Size(1300, 750);
+
+ panel2.Visible = false;
+ }
+
+ private void btn_Photo_Click(object sender, EventArgs e)
+ {
+ this.Size = new Size(560, 750);
+
+ panel2.Visible = true;
+ }
}
}
\ No newline at end of file