Masato Taruishi
taru****@users*****
2004年 9月 21日 (火) 18:32:01 JST
===================================================================
RCS file: projects/yubin/gui/gui.glade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/yubin/gui/gui.glade 2004/09/21 05:06:01 1.1
+++ projects/yubin/gui/gui.glade 2004/09/21 09:32:01 1.2
@@ -9,6 +9,8 @@
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
+ <property name="default_width">367</property>
+ <property name="default_height">324</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- projects/yubin/gui/yubin.rb 2004/09/21 08:56:01 1.6
+++ projects/yubin/gui/yubin.rb 2004/09/21 09:32:01 1.7
@@ -39,8 +39,8 @@
end
def create( filter )
- $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
- open("|ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}") { |io|
+ $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'"
+ open("|ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'") { |io|
postalCode = nil
postalAddress = nil
each_entry(io) do |entry|
@@ -90,7 +90,13 @@
when /[0-9\-]+/
filter = "postalCode=#{key}*" if key.size > 1
else
- filter = "st=*#{key}*" if key.size > 3
+ if key.size > 3
+ filter="(|(o=*#{key}*)(&"
+ key.split(" ").each do |k|
+ filter << "(st=*#{k}*)"
+ end
+ filter << "))"
+ end
end
if ! filter.nil?
visible = {}