You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2003/04/11 07:41:18 UTC

cvs commit: embperl/test/cmp2 hidden.htm input.htm

richter     2003/04/10 22:41:18

  Modified:    .        Changes.pod DOM.xs Embperl.pm Makefile.PL epcmd2.c
                        epcomp.c epdom.c epdom.h epparse.c
               driver   eplibxslt.c
               test/cmp2 hidden.htm input.htm
  Log:
  %idat handling for checkboxes
  
  Revision  Changes    Path
  1.207     +3 -0      embperl/Changes.pod
  
  Index: Changes.pod
  ===================================================================
  RCS file: /home/cvs/embperl/Changes.pod,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- Changes.pod	30 Mar 2003 18:57:01 -0000	1.206
  +++ Changes.pod	11 Apr 2003 05:41:16 -0000	1.207
  @@ -74,6 +74,9 @@
      - Fix SIGSEGV on sparc in cleanup. Patch from Angus Lees.
      - Apply patch from Angus Lees which avoids a lot of (harmless) compiler
        warnings.
  +   - %idat is now also populated for checkboxes, radiobutton where no matching
  +     value in %fdat is found. This avoid duplicate submission of formdata
  +     when using [$ hidden $].
   
   =head1 2.0b8  (BETA)  25. Juni 2002
   
  
  
  
  1.8       +2 -2      embperl/DOM.xs
  
  Index: DOM.xs
  ===================================================================
  RCS file: /home/cvs/embperl/DOM.xs,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DOM.xs	30 Mar 2003 18:57:01 -0000	1.7
  +++ DOM.xs	11 Apr 2003 05:41:16 -0000	1.8
  @@ -34,7 +34,7 @@
       SV *    pSV = SvRV(pRV) ;
       if ((mg = mg_find (pSV, '~')))
           {
  -        pDomNode = (tDomNode *)(mg -> mg_len) ;
  +        pDomNode = (tDomNode *)(mg -> mg_ptr) ;
           if (xDomTree)
               pDomNode -> xDomTree = xDomTree ;
           if (xNode)    
  
  
  
  1.182     +2 -2      embperl/Embperl.pm
  
  Index: Embperl.pm
  ===================================================================
  RCS file: /home/cvs/embperl/Embperl.pm,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- Embperl.pm	28 Jan 2003 07:21:26 -0000	1.181
  +++ Embperl.pm	11 Apr 2003 05:41:16 -0000	1.182
  @@ -46,7 +46,7 @@
   
   @ISA = qw(Exporter DynaLoader);
   
  -$VERSION = '2.0b9_dev-7' ;
  +$VERSION = '2.0b9' ;
   
   
   if ($modperl  = $ENV{MOD_PERL})
  
  
  
  1.64      +2 -2      embperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/embperl/Makefile.PL,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Makefile.PL	30 Mar 2003 18:57:01 -0000	1.63
  +++ Makefile.PL	11 Apr 2003 05:41:16 -0000	1.64
  @@ -550,7 +550,7 @@
               }
           }
       }
  -elsif ($apache_src ne '' && -X "\"$apache_src/bin/httpd\"")
  +elsif ($apache_src ne '' && -X "$apache_src/bin/httpd")
       {
       my @vers = start ("\"$apache_src/bin/httpd\" -v") ;
       
  
  
  
  1.10      +13 -3     embperl/epcmd2.c
  
  Index: epcmd2.c
  ===================================================================
  RCS file: /home/cvs/embperl/epcmd2.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- epcmd2.c	30 Mar 2003 18:57:01 -0000	1.9
  +++ epcmd2.c	11 Apr 2003 05:41:16 -0000	1.10
  @@ -100,6 +100,7 @@
       int	    bEqual = 0 ;
       SV **   ppSV = hv_fetch(r -> pThread -> pFormHash, (char *)pName, nNameLen, 0) ;  
       tNodeData * pNode = Node_selfLevel (r -> pApp, pDomTree, xNode, nRepeatLevel) ;
  +    SV *    pInputHashValue = NULL ;
   
       if (ppSV)
   	{
  @@ -112,7 +113,7 @@
               if (hv_exists ((HV *)pSV, (char *)pVal, nValLen))
   		{
   		bEqual = 1 ;
  -		hv_store (r -> pThread -> pInputHash, (char *)pName, nNameLen, newSVpv ((nValLen?((char *)pVal):""), nValLen), 0) ;
  +		pInputHashValue = newSVpv ((nValLen?((char *)pVal):""), nValLen) ;
   		}
   	    }
   	else
  @@ -123,7 +124,7 @@
   	    if ((int)dlen == nValLen && strncmp (pVal, pData, dlen) == 0)
   		{
   		bEqual = 1 ;
  -		hv_store (r -> pThread -> pInputHash, (char *)pName, nNameLen, newSVsv(pSV), 0) ; 
  +		pInputHashValue = newSVsv(pSV) ; 
   		}
   	    }
   
  @@ -155,6 +156,15 @@
               }
   
   	}
  +
  +    if (pInputHashValue)
  +        hv_store (r -> pThread -> pInputHash, (char *)pName, nNameLen, pInputHashValue, 0) ; 
  +    else
  +        {
  +        if (!hv_exists (r -> pThread -> pInputHash, (char *)pName, nNameLen))
  +            hv_store (r -> pThread -> pInputHash, (char *)pName, nNameLen, newSVpv ("", 0), 0) ; 
  +        }
  +
       }
   
   /* ---------------------------------------------------------------------------- */
  
  
  
  1.9       +2 -2      embperl/epcomp.c
  
  Index: epcomp.c
  ===================================================================
  RCS file: /home/cvs/embperl/epcomp.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- epcomp.c	30 Mar 2003 18:57:01 -0000	1.8
  +++ epcomp.c	11 Apr 2003 05:41:16 -0000	1.9
  @@ -827,7 +827,7 @@
   		    else if (*p == 'q')
   			{
   			char s [20] ;
  -			int  l = sprintf (s, "%ld", pDomTree -> xNdx) ;
  +			int  l = sprintf (s, "%hd", pDomTree -> xNdx) ;
   			StringAdd (r -> pApp, ppCode, s, l) ; 
   			}
   		    else if (*p == 'p')
  
  
  
  1.11      +5 -5      embperl/epdom.c
  
  Index: epdom.c
  ===================================================================
  RCS file: /home/cvs/embperl/epdom.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- epdom.c	30 Mar 2003 18:57:02 -0000	1.10
  +++ epdom.c	11 Apr 2003 05:41:17 -0000	1.11
  @@ -211,7 +211,7 @@
       else
           {
           char buf[256] ;
  -        sprintf (buf, "%d bytes", n) ;
  +        sprintf (buf, "%zu bytes", n) ;
           LogErrorParam (a, rcOutOfMemory, "str_malloc failed", buf) ;
           }
   
  @@ -238,7 +238,7 @@
       else
           {
           char buf[256] ;
  -        sprintf (buf, "%d bytes", n) ;
  +        sprintf (buf, "%zu bytes", n) ;
           LogErrorParam (a, rcOutOfMemory, "str_malloc_dbg failed", buf) ;
           }
   
  @@ -266,7 +266,7 @@
       else
           {
           char buf[256] ;
  -        sprintf (buf, "%d bytes", n) ;
  +        sprintf (buf, "%zu bytes", n) ;
           LogErrorParam (a, rcOutOfMemory, "str_realloc failed", buf) ;
           }
       
  @@ -295,7 +295,7 @@
       else
           {
           char buf[256] ;
  -        sprintf (buf, "%d bytes", n) ;
  +        sprintf (buf, "%zu bytes", n) ;
           LogErrorParam (a, rcOutOfMemory, "str_realloc failed", buf) ;
           }
   
  
  
  
  1.7       +5 -2      embperl/epdom.h
  
  Index: epdom.h
  ===================================================================
  RCS file: /home/cvs/embperl/epdom.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- epdom.h	22 Oct 2002 05:29:05 -0000	1.6
  +++ epdom.h	11 Apr 2003 05:41:17 -0000	1.7
  @@ -260,6 +260,10 @@
                                  /*in*/ const char *	    sText,
     			       /*in*/ int		    nLen) ;
   
  +void NdxStringFree (/*in*/ struct tApp * a,
  +                    /*in*/ tStringIndex             nNdx) ;
  +
  +
   
   #define SV2String(pSV,l)  (SvOK (pSV)?SvPV (pSV, l):(l=0,((char *)NULL)))
   
  @@ -270,7 +274,6 @@
   #define Ndx2StringLen(nNdx,sVal,nLen) { HE * pHE = pStringTableArray[nNdx] ; nLen=HeKLEN(pHE) ; sVal = HeKEY (pHE) ; }
   
   #define NdxStringRefcntInc(a,nNdx) (SvREFCNT_inc (HeVAL (pStringTableArray[nNdx])))
  -
   
   #ifdef DMALLOC
   int ArrayNew_dbg (/*in*/ struct tApp * a, 
  
  
  
  1.9       +3 -3      embperl/epparse.c
  
  Index: epparse.c
  ===================================================================
  RCS file: /home/cvs/embperl/epparse.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- epparse.c	30 Mar 2003 18:57:02 -0000	1.8
  +++ epparse.c	11 Apr 2003 05:41:17 -0000	1.9
  @@ -77,7 +77,7 @@
       char *	    pKey ;
       SV * *	    ppSV ;
       SV * 	    pSVValue ;
  -    IV		    l	 ;
  +    I32		    l	 ;
       HV *            pHVProcInfo ;
       int             n ;
       epTHX ;
  @@ -223,7 +223,7 @@
       int		    numTokens ;
       struct tToken * pTable ;
       struct tToken * p ;
  -    IV		    l	 ;
  +    I32		    l	 ;
       STRLEN	    len	 ;
       int		    n ;
       int		    i ;
  
  
  
  1.3       +3 -3      embperl/driver/eplibxslt.c
  
  Index: eplibxslt.c
  ===================================================================
  RCS file: /home/cvs/embperl/driver/eplibxslt.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- eplibxslt.c	22 Oct 2002 05:45:12 -0000	1.2
  +++ eplibxslt.c	11 Apr 2003 05:41:18 -0000	1.3
  @@ -86,7 +86,7 @@
       char *	    pKey ;
       SV *            pValue ;
       STRLEN          len ;
  -    IV              l ;
  +    I32             l ;
       int		    n ;
       const char * *  pParamArray ;
       const char *    sStylesheet ;
  @@ -968,7 +968,7 @@
       char *	    pKey ;
       SV *            pValue ;
       STRLEN          len ;
  -    IV		    l ;
  +    I32		    l ;
       int		    n ;
       const char * *  pParamArray ;
       
  
  
  
  1.5       +1 -1      embperl/test/cmp2/hidden.htm
  
  Index: hidden.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/cmp2/hidden.htm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hidden.htm	17 Jan 2003 08:45:09 -0000	1.4
  +++ hidden.htm	11 Apr 2003 05:41:18 -0000	1.5
  @@ -29,7 +29,7 @@
   
       <select name="feld2"><option value="Wert1">rlp</option></select>
   
  -	s1<input type="hidden" name="feld2" value="Wert2"><input type="hidden" name="feld3" value="Wert3"><input type="hidden" name="feld4" value="Wert4">
  +	s1<input type="hidden" name="feld3" value="Wert3"><input type="hidden" name="feld4" value="Wert4">
   
       <select name="feld2"><option value="Wert1"><option value="Wert2" selected>rlp</option></select>
       
  
  
  
  1.4       +66 -2     embperl/test/cmp2/input.htm
  
  Index: input.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/cmp2/input.htm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- input.htm	20 Nov 2002 06:56:28 -0000	1.3
  +++ input.htm	11 Apr 2003 05:41:18 -0000	1.4
  @@ -222,18 +222,42 @@
   	</select>
   
   	
  -	ks = cb1 cb2 cb5 cb6 cb7 cb8 dec escmult feld1 feld2 feld3 feld4 feld5 feld5a feld5b feld6 feld7 feld8 mult neu1 neu2 neu3 undef<p>
  +	ks = Kategorie Region cb1 cb10 cb11 cb2 cb3 cb4 cb5 cb6 cb7 cb8 cb9 dec escmult feld1 feld2 feld3 feld4 feld5 feld5a feld5b feld6 feld7 feld8 foo mult neu1 neu2 neu3 undef<p>
   
   	<table border=9>
   		<tr>
  +			<td>Kategorie</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>Region</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb1</td><td>cbv1</td>
   		</tr>
   	
   		<tr>
  +			<td>cb10</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>cb11</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb2</td><td>cbv2</td>
   		</tr>
   	
   		<tr>
  +			<td>cb3</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>cb4</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb5</td><td>cbv5</td>
   		</tr>
   	
  @@ -250,6 +274,10 @@
   		</tr>
   	
   		<tr>
  +			<td>cb9</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>dec</td><td>a &amp; b</td>
   		</tr>
   	
  @@ -298,6 +326,10 @@
   		</tr>
   	
   		<tr>
  +			<td>foo</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>mult</td><td>Wert6</td>
   		</tr>
   	
  @@ -533,18 +565,42 @@
   		<input type="text" name="feld1" value="">
   		<input type="text" name="feld1" value="">
           </p>
  -	ks = cb1 cb2 cb5 cb6 cb7 cb8 dec escmult feld1 feld2 feld3 feld4 feld5 feld5a feld5b feld6 feld7 feld8 mult neu1 neu2 neu3 ta undef<p>
  +	ks = Kategorie Region cb1 cb10 cb11 cb2 cb3 cb4 cb5 cb6 cb7 cb8 cb9 dec escmult feld1 feld2 feld3 feld4 feld5 feld5a feld5b feld6 feld7 feld8 foo mult neu1 neu2 neu3 ta undef<p>
   
   	<table border=10>
   		<tr>
  +			<td>Kategorie</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>Region</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb1</td><td>cbv1</td>
   		</tr>
   	
   		<tr>
  +			<td>cb10</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>cb11</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb2</td><td>cbv2</td>
   		</tr>
   	
   		<tr>
  +			<td>cb3</td><td></td>
  +		</tr>
  +	
  +		<tr>
  +			<td>cb4</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>cb5</td><td>cbv5</td>
   		</tr>
   	
  @@ -561,6 +617,10 @@
   		</tr>
   	
   		<tr>
  +			<td>cb9</td><td></td>
  +		</tr>
  +	
  +		<tr>
   			<td>dec</td><td>a &amp; b</td>
   		</tr>
   	
  @@ -606,6 +666,10 @@
   	
   		<tr>
   			<td>feld8</td><td>Wert8</td>
  +		</tr>
  +	
  +		<tr>
  +			<td>foo</td><td></td>
   		</tr>
   	
   		<tr>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org