[gq-commit] gq/src dt_binary.c,1.14,1.15 dt_cert.c,1.8,1.9 dt_clist.c,1.5,1.6 dt_crl.c,1.5,1.6 dt_entry.c,1.10,1.11 dt_generic_binary.c,1.10,1.11 dt_jpeg.c,1.10,1.11 dt_oc.c,1.17,1.18 dt_password.c,1.16,1.17 dt_text.c,1.11,1.12 dt_time.c,1.9,1.10 search.c,1.46,1.47 syntax.c,1.16,1.17 syntax.h,1.8,1.9

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9595

Modified Files:
	dt_binary.c dt_cert.c dt_clist.c dt_crl.c dt_entry.c 
	dt_generic_binary.c dt_jpeg.c dt_oc.c dt_password.c dt_text.c 
	dt_time.c search.c syntax.c syntax.h 
Log Message:
* Rudimentary display type support for search results


Index: dt_binary.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_binary.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dt_binary.c	12 Oct 2003 05:48:20 -0000	1.14
--- dt_binary.c	12 Oct 2003 06:14:18 -0000	1.15
***************
*** 68,72 ****
  static dt_binary_handler dt_binary_handler_vtab = {
       {
! 	  "Binary", TRUE,
  	  dt_binary_get_widget, /* reused from dt_generic_binary */
  	  dt_binary_get_data,
--- 68,74 ----
  static dt_binary_handler dt_binary_handler_vtab = {
       {
! 	  "Binary", 
! 	  TRUE,
! 	  FALSE,
  	  dt_binary_get_widget, /* reused from dt_generic_binary */
  	  dt_binary_get_data,

Index: dt_cert.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_cert.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dt_cert.c	29 Sep 2003 19:24:16 -0000	1.8
--- dt_cert.c	12 Oct 2003 06:14:18 -0000	1.9
***************
*** 72,76 ****
       {
  	  {
! 	       "Certificate", TRUE,
  	       dt_clist_get_widget,
  	       dt_clist_get_data,
--- 72,79 ----
       {
  	  {
! 	       "Certificate", 
! 	       TRUE,
! 	       FALSE,
! 
  	       dt_clist_get_widget,
  	       dt_clist_get_data,

Index: dt_clist.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_clist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dt_clist.c	9 Oct 2003 05:15:06 -0000	1.5
--- dt_clist.c	12 Oct 2003 06:14:18 -0000	1.6
***************
*** 60,64 ****
       {
  	  {
! 	       "Column List", FALSE,
  	       dt_clist_get_widget,
  	       dt_clist_get_data,
--- 60,67 ----
       {
  	  {
! 	       "Column List",
! 	       FALSE,
! 	       FALSE,
! 
  	       dt_clist_get_widget,
  	       dt_clist_get_data,

Index: dt_crl.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_crl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dt_crl.c	29 Sep 2003 19:24:16 -0000	1.5
--- dt_crl.c	12 Oct 2003 06:14:18 -0000	1.6
***************
*** 71,75 ****
       {
  	  {
! 	       "Certificate Revocation List", TRUE,
  	       dt_clist_get_widget,
  	       dt_clist_get_data,
--- 71,78 ----
       {
  	  {
! 	       "Certificate Revocation List",
! 	       TRUE,
! 	       FALSE, 
! 
  	       dt_clist_get_widget,
  	       dt_clist_get_data,

Index: dt_entry.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_entry.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dt_entry.c	2 Oct 2003 16:16:25 -0000	1.10
--- dt_entry.c	12 Oct 2003 06:14:18 -0000	1.11
***************
*** 55,59 ****
  static dt_entry_handler dt_entry_handler_vtab = {
       {
! 	  "Entry", TRUE,
  	  dt_entry_get_widget,
  	  dt_entry_get_data,
--- 55,62 ----
  static dt_entry_handler dt_entry_handler_vtab = {
       {
! 	  "Entry", 
! 	  TRUE,
! 	  TRUE,
! 
  	  dt_entry_get_widget,
  	  dt_entry_get_data,

Index: dt_generic_binary.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_generic_binary.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dt_generic_binary.c	2 Oct 2003 16:16:25 -0000	1.10
--- dt_generic_binary.c	12 Oct 2003 06:14:18 -0000	1.11
***************
*** 68,71 ****
--- 68,72 ----
       {
  	  "Generic Binary", FALSE,
+ 	  FALSE,
  	  dt_generic_binary_get_widget,
  	  NULL,

Index: dt_jpeg.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_jpeg.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dt_jpeg.c	30 Sep 2003 17:20:25 -0000	1.10
--- dt_jpeg.c	12 Oct 2003 06:14:18 -0000	1.11
***************
*** 58,62 ****
  static dt_jpeg_handler dt_jpeg_handler_vtab = {
       { /* dt_handler */
! 	  "JPEG", TRUE,
  	  dt_generic_binary_get_widget,	/* reused from dt_generic_binary */
  	  dt_jpeg_get_data,
--- 58,65 ----
  static dt_jpeg_handler dt_jpeg_handler_vtab = {
       { /* dt_handler */
! 	  "JPEG", 
! 	  TRUE,
! 	  FALSE,  /* might become TRUE in years to come */
! 
  	  dt_generic_binary_get_widget,	/* reused from dt_generic_binary */
  	  dt_jpeg_get_data,

Index: dt_oc.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_oc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dt_oc.c	8 Oct 2003 22:01:07 -0000	1.17
--- dt_oc.c	12 Oct 2003 06:14:18 -0000	1.18
***************
*** 60,64 ****
  static dt_oc_handler dt_oc_handler_vtab = {
       {
! 	  "Objectclass", FALSE,
  	  dt_oc_get_widget,
  	  dt_oc_get_data,
--- 60,66 ----
  static dt_oc_handler dt_oc_handler_vtab = {
       {
! 	  "Objectclass", 
! 	  FALSE,
! 	  TRUE,
  	  dt_oc_get_widget,
  	  dt_oc_get_data,

Index: dt_password.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_password.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dt_password.c	11 Oct 2003 07:07:40 -0000	1.16
--- dt_password.c	12 Oct 2003 06:14:18 -0000	1.17
***************
*** 95,99 ****
  static dt_password_handler dt_password_handler_vtab = {
       {
! 	  "Password", TRUE,
  	  dt_password_get_widget,
  	  dt_password_get_data,
--- 95,102 ----
  static dt_password_handler dt_password_handler_vtab = {
       {
! 	  "Password",
! 	  TRUE,
! 	  TRUE,
! 
  	  dt_password_get_widget,
  	  dt_password_get_data,

Index: dt_text.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_text.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dt_text.c	2 Oct 2003 16:16:26 -0000	1.11
--- dt_text.c	12 Oct 2003 06:14:18 -0000	1.12
***************
*** 59,63 ****
  static dt_text_handler dt_text_handler_vtab = {
       {
! 	  "Multi-line Text", TRUE,
  	  dt_text_get_widget,
  #if GTK_MAJOR >= 2
--- 59,66 ----
  static dt_text_handler dt_text_handler_vtab = {
       {
! 	  "Multi-line Text", 
! 	  TRUE,
! 	  TRUE,
! 
  	  dt_text_get_widget,
  #if GTK_MAJOR >= 2

Index: dt_time.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_time.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dt_time.c	11 Oct 2003 21:26:31 -0000	1.9
--- dt_time.c	12 Oct 2003 06:14:18 -0000	1.10
***************
*** 62,66 ****
  
  static dt_time_handler dt_time_handler_vtab = {
!      "Generalized Time", TRUE,
       dt_time_get_widget,
       dt_time_get_data,
--- 62,69 ----
  
  static dt_time_handler dt_time_handler_vtab = {
!      "Generalized Time",
!      TRUE,
!      TRUE,
! 
       dt_time_get_widget,
       dt_time_get_data,

Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** search.c	11 Oct 2003 22:37:09 -0000	1.46
--- search.c	12 Oct 2003 06:14:18 -0000	1.47
***************
*** 47,50 ****
--- 47,51 ----
  #include "browse.h"
  #include "state.h"
+ #include "syntax.h"
  #include "utf8-compat.h" 
  
***************
*** 638,646 ****
  	       for(attr = ldap_first_attribute(ld, e, &berptr); attr != NULL;
  		   attr = ldap_next_attribute(ld, e, berptr)) {
! 		    /*
! 		    struct syntax_handler *handler =
! 			 get_syntax_handler_of_attr(server, attr, NULL);
! 		    */
! 		    
  
  		    /* This should now work for ;binary as well */
--- 639,647 ----
  	       for(attr = ldap_first_attribute(ld, e, &berptr); attr != NULL;
  		   attr = ldap_next_attribute(ld, e, berptr)) {
! 
! 		    if (!show_in_search(server, attr)) {
! 			 ldap_memfree(attr);
! 			 continue;
! 		    }
  
  		    /* This should now work for ;binary as well */

Index: syntax.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/syntax.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** syntax.c	28 Sep 2003 23:10:49 -0000	1.16
--- syntax.c	12 Oct 2003 06:14:18 -0000	1.17
***************
*** 571,574 ****
--- 571,588 ----
  }
  
+ int show_in_search(struct ldapserver *server, const char *attrname)
+ {
+      display_type_handler *dh;
+      struct syntax_handler *sh =
+ 	  get_syntax_handler_of_attr(server, attrname, NULL);
+      
+      if (!sh) return FALSE;
+ 
+      dh = get_dt_handler(sh->displaytype);
+      if (!dh) return FALSE;
+ 
+      return dh->show_in_search_result;
+ }
+ 
  GByteArray *identity(const char *val, int len)
  {

Index: syntax.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/syntax.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** syntax.h	28 Sep 2003 23:10:49 -0000	1.8
--- syntax.h	12 Oct 2003 06:14:18 -0000	1.9
***************
*** 46,49 ****
--- 46,51 ----
       char *name;
       gboolean selectable;
+      gboolean show_in_search_result;
+ 
       GtkWidget* (*get_widget)(struct formfill *form, 
  			      GByteArray *data, 
***************
*** 71,74 ****
--- 73,78 ----
  display_type_handler *get_dt_handler(int type);
  int get_dt_from_handler(display_type_handler *h);
+ 
+ int show_in_search(struct ldapserver *server, const char *attrname);
  
  void init_syntaxes(void);