April 2011 - Development - lists.drupal.org

Please stop using git diff --no-prefix. -p1 patches are now the standard
by Randy Fay 14 Apr '11

14 Apr '11

I noticed in another thread that somebody suggested git diff --no-prefix for creating patches. Please don't do that any more. We've moved to standard git patches (git diff without the --no-prefix, meaning a patch -p1 patch). Testbot support for -p0 patches (--no-prefix) will be removed around the end of May. See http://groups.drupal.org/node/140204 Some of you may have the --no-prefix stuff in your .gitconfig. Please remove it from there as well. In the issue queues, please start to insist on rerolls for -p0 formatted patches (if they have no a/ and b/ in front of the filenames. Thanks for your cooperation. -Randy -- Randy Fay Drupal Module and Site Development randy(a)randyfay.com +1 970.462.7450

3 3

using git, create patch with new files
by Dave Cohen 12 Apr '11

12 Apr '11

I'm trying, and failing, to create a patch that adds new files to a module. According to http://drupal.org/node/707484, I should simply run `git add ...` then "Next time you run git diff, these new files will be included as well." In my experience, this statement is false. When I run `git status`, I see something like this: [dave@starbuck fb-3]$ git status # On branch 6.x-3.x # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: fb.process.inc # new file: fb_tab.js # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.txt # modified: contrib/fb_example.module # modified: fb.module # modified: fb_canvas.admin.inc # modified: fb_canvas.module # modified: fb_devel.module # modified: fb_settings.inc # modified: fb_tab.admin.inc # modified: fb_tab.info # modified: fb_tab.module # modified: fb_url_rewrite.inc When I run `git diff`, I see changes to all the modified files, but I do not see the new files. What am I missing? Thanks, -Dave

10 14

Re: [development] using git, create patch with new files
by Dave Cohen 11 Apr '11

11 Apr '11

Kyle, "git diff --cached" gets me only the added files, not the modified files. Still looking for a way to build one cohesive .patch file. -Dave On Monday 11 April 2011 10:28:45 Kyle Mathews wrote: > Hmm... well those instructions are wrong I guess. > > "git diff" is the diff of changes since the last commit that have *not* been > staged. So once you've added a file via "git add", it won't show up anymore > when you run "git diff". > > If you want to see the diff between the last commit and staged files, run > "git diff --cached" > > -- > Kyle Mathews > > Blog: kyle.mathews2000.com/blog > Twitter: http://twitter.com/kylemathews >

1 0

Doubts on VIEWS & DATA module - please help me
by Austin Einter 09 Apr '11

09 Apr '11

Hi All I have around 5 different tables containing employee records (Name, skill set , current company, years of experience etc). I am trying to show the employee records for different kind of search. One seacrh may be, show all the employees having knowledge on PHP and must have 5+ years of experience. I know, I need to a database query and show it in a view (either a page or block display). I know how to collect the records. The query will be something like this. SELECT res_table.name, res_table.yrsexp, res_table.emailid FROM res_table WHERE (res_table.yrsexp >= 5 AND skilltable.userid = $user->userid AND skilltable.skill = 'PHP') Or even in some cases I need to go for JOIN. Somebody suggested to use Data module for it. I gave a try, I am just seeing tables (in view creation), not sure how do I impose the custom SQL query. Is it really possible to impose above kind of sql query using Data module??? Or is it the best way to go for custom module and implement _alter_view or _pre_exute_view hooks. Regards Austin

1 0

Zen subtheme problem with blocks
by nan wich 08 Apr '11

08 Apr '11

I am creating a new Zen subtheme because the theme I tried previously ran into a major problem. I have been to the blocks admin page and verified that my blocks are set up. Several definitely have content, because I can dump what is being returned from hook_block(). No block regions are showing any content at all, not even the sidebars. Adding a get_defined_vars() to page.tpl.php shows all region variables to be empty. I don't know if it is cause or effect, but body{} has class="no-sidebars" (even though I have them) but it's not just the sidebars that should have data. I have tried putting stuff in every region and it never shows up. I hope someone can tell me what I've done that was stupid because my deadline is fast approaching. BTW, yes I did search, not just the Zen issue queue, but the whole site. I saw many posts, but no real fixes. Nancy Injustice anywhere is a threat to justice everywhere. -- Dr. Martin L. King, Jr.

2 1

Developer sought for new website
by Ben Garcia 08 Apr '11

08 Apr '11

The Phoebe A. Hearst Museum of Anthropology (PAHMA)at UC Berkeleyis seeking a Bay Area-based developer to create a new website.The Museum's current website, hearstmuseum.berkeley.edu, is almost ten years old and no longer serves the needs of the institution. The new website will be an interim, low-budget Drupal-based solution that will have an expected life of about five years. PAHMA is engaged in a transformation of its galleries and collections storage that will be completed over the next three years at which time planning for a website that best serves the transformed Museum's needs will begin. Contact ben.garcia(a)berkeley.edu for a copy.

2 2

wordpress and drupal integration
by Pooya 08 Apr '11

08 Apr '11

I've got a huge multi-site with drupal on my server, each website contains totally different content like games, movies,... I needed to make a main page with a custom front-page theme which shows updates from all the sites under this multi, news about my client company and some other stuff. It's like a portal like yahoo.com as front-page and mail,news,weather,jobs,... as multi But the problem here is that root address and main page is already with wordpress and we don't have any plan to change this, so we decided to add all this portal front-page and updates to wordpress front page. If you have anything here or strategy to share with me, I'll be thankful. We also offer a hosting server, so all the wordpress, drupal multi-sites and vBulletin are on the same server and can share database. One way is to edit wordpress theme and retrieve all the data directly from drupal database which I don't like this. Thanks for your time -- Pooya Sanooei Twitter <http://twitter.com/sourcesoft> - Facebook<http://facebook.com/pooya.sanooei>- Website <http://www.javabgoo.com>

4 6

XWChat module with Jabberd2
by Salvatore De Paolis 07 Apr '11

07 Apr '11

Hi all, I wasn't sure if posting this on the support or development, so to avoid crossposting I'm doing it only here. I have a Jabberd2 server and I'm using punjab to be able to have BOSH support to allow communication with XWChat. I've configure a proxy with Lighttpd and now the connection seems to work fine although I get an authentication error in XWChat. It doesn't matter if I use SSL or not the result is the same. "Wrong combination Username / Password. Please re-login to the site for synchronization Disconnected from Server" I'll post here some logs of both methods. Without SSL: POST <body rid="344208" sid="4ce5404974439beabde16c904f82d134" xmlns="http://jabber.org/protocol/httpbind"><iq xmlns="jabber:client" type="get" id="auth1"><query xmlns="jabber:iq:auth"><username>testuser</username></query></iq></body> RESPONSE <body xmlns='http://jabber.org/protocol/httpbind'><iq xmlns='jabber:client' type='result' id='auth1'><query xmlns='jabber:iq:auth'><username>testuser</username><resource/><password/><digest/> </query></iq></body> POST <body rid="344209" sid="4ce5404974439beabde16c904f82d134" xmlns="http://jabber.org/protocol/httpbind"><iq xmlns="jabber:client" type="set" id="auth2"> <query xmlns="jabber:iq:auth"> <username>testuser</username><resource>Jabberd2</resource> <digest>0dbd24a4777e51d9be1a4faa50d1345e05818d99</digest></query></iq></body> RESPONSE <body xmlns='http://jabber.org/protocol/httpbind'><iq xmlns='jabber:client' type='error' id='auth2'> <error code='401'/><query xmlns='jabber:iq:auth'> <username>testuser</username><resource>Jabberd2</resource> <digest>0dbd24a4777e51d9be1a4faa50d1345e05818d99</digest></query></iq></body> With SSL: POST <body content="text/xml; charset=utf-8" hold="1" xmlns="http://jabber.org/protocol/httpbind" to="localhost" wait="10" rid="515983" route="xmpp:localhost:5222" secure="false" ver="1.6" xmlns:xmpp="urn:xmpp:xbosh" xmpp:version="1.0"></body> RESPONSE <body xmlns='http://jabber.org/protocol/httpbind' inactivity='60' secure='true' authid='5nsvdw379nv7su01bkx88j92ibjpfyillbgz8k6h' content='text/xml; charset=utf-8' window='3' polling='15' sid='a029a1b4f59393f0a4e2a0856a45d948' requests='2' wait='10'> <stream:features xmlns='jabber:client'xmlns:stream='http://etherx.jabber.org/streams'> <address xmlns='http://affinix.com/jabber/address'>127.0.0.1</address> <mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'> <mechanism>PLAIN</mechanism> <mechanism>DIGEST-MD5</mechanism> </mechanisms> <auth xmlns='http://jabber.org/features/iq-auth'/> <register xmlns='http://jabber.org/features/iq-register'/> </stream:features> </body> POST <body rid="515984" sid="a029a1b4f59393f0a4e2a0856a45d948" xmlns="http://jabber.org/protocol/httpbind"> <auth xmlns="urn:ietf:params:xml:ns:xmpp-sasl" mechanism="DIGEST-MD5"></auth></body> RESPONSE <body xmlns='http://jabber.org/protocol/httpbind'> <challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>cmVhbG09InNpbnVzaWEub3JnIiwgbm9uY2U9Ilh5RWk3VGZzcSttRitPOUdic2tQU0E9PSIsIHFvcD0iYXV0aCIsIGNoYXJzZXQ9dXRmLTgsIGFsZ29yaXRobT1tZDUtc2Vzcw==</challenge> </body> POST <body rid="515985" sid="a029a1b4f59393f0a4e2a0856a45d948" xmlns="http://jabber.org/protocol/httpbind"> <response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">dXNlcm5hbWU9Iml3a3NlIixyZWFsbT0ic2ludXNpYS5vcmciLG5vbmNlPSJYeUVpN1Rmc3ErbUYrTzlHYnNrUFNBPT0iLGNub25jZT0iR0RyeXNXbGhVdnlVRVAiLG5jPSIwMDAwMDAwMSIscW9wPWF1dGgsZGlnZXN0LXVyaT0ieG1wcC9zaW51c2lhLm9yZyIscmVzcG9uc2U9IjkzYzY2NzE4MTgzMWI4YThmYmY3NzcwMGNiZmZmNDkwIixjaGFyc2V0PSJ1dGYtOCI=</response> </body> RESPONSE <body xmlns='http://jabber.org/protocol/httpbind'> <failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><malformed-request/> </failure> </body> Any help to understand better where the problem is? Regards Salvatore

1 0

Mawusee Komla FOLI-AWLI wants to stay in touch on LinkedIn
by Mawusee Komla FOLI-AWLI via LinkedIn 01 Apr '11

01 Apr '11

LinkedIn ------------Mawusee Komla FOLI-AWLI requested to add you as a connection on LinkedIn: ------------------------------------------ Anupom, I'd like to add you to my professional network on LinkedIn. - Mawusee Komla FOLI-AWLI Accept invitation from Mawusee Komla FOLI-AWLI http://www.linkedin.com/e/mxrvzj-glzcpj0v-1w/zJRDTPf0epu2i2D9H2QD0wbj02vn2t… View invitation from Mawusee Komla FOLI-AWLI http://www.linkedin.com/e/mxrvzj-glzcpj0v-1w/zJRDTPf0epu2i2D9H2QD0wbj02vn2t… ------------------------------------------ DID YOU KNOW you can showcase your professional knowledge on LinkedIn to receive job/consulting offers and enhance your professional reputation? Posting replies to questions on LinkedIn Answers puts you in front of the world's professional community. http://www.linkedin.com/e/mxrvzj-glzcpj0v-1w/abq/inv-24/ -- (c) 2011, LinkedIn Corporation

1 0